Skip to content

Commit

Permalink
Merge pull request #18666 from civicrm/5.30
Browse files Browse the repository at this point in the history
5.30 to master
  • Loading branch information
eileenmcnaughton authored Oct 2, 2020
2 parents 02bd631 + f8246b8 commit 08642a5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 29 deletions.
2 changes: 1 addition & 1 deletion settings/Mailing.setting.php
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,6 @@
'is_domain' => 1,
'is_contact' => 0,
'description' => ts('The frequency that CiviMail updates its sent mail database.'),
'help_text' => 'CiviMail records email sent at the frequency you specify. If you set it to 1, it will update the database every time it sends an email. This ensures that emails are not resent if the batch job fails, but this may cause a performance hit, particularly for large jobs.',
'help_text' => NULL,
],
];
14 changes: 14 additions & 0 deletions templates/CRM/Admin/Form/Setting/Mail.hlp
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{*
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC. All rights reserved. |
| |
| This work is published under the GNU AGPLv3 license with some |
| permitted exceptions and without any warranty. For full license |
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
{htxt id="civimail-sync-interval-id"}
<p>
{ts}CiviMail records email sent at the frequency you specify. If you set it to 1, it will update the database every time it sends an email. This ensures that emails are not resent if the batch job fails, but this may cause a performance hit, particularly for large jobs.{/ts}
</p>
{/htxt}
28 changes: 0 additions & 28 deletions templates/CRM/Mailing/Form/Settings.hlp

This file was deleted.

0 comments on commit 08642a5

Please sign in to comment.