aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author3D-I <eataly3d@gmail.com>2019-08-08 01:31:40 +0200
committer3D-I <eataly3d@gmail.com>2019-08-08 01:33:16 +0200
commitb6e5a5fca8b6eed732aa88fc60a7bacd8ff0ce98 (patch)
tree495d41974df5221a8065ce06eb72f4a049abd8bb
parent82a04debca57e2ff93291d9cfdcdd74204d82ab0 (diff)
downloadforums-b6e5a5fca8b6eed732aa88fc60a7bacd8ff0ce98.tar
forums-b6e5a5fca8b6eed732aa88fc60a7bacd8ff0ce98.tar.gz
forums-b6e5a5fca8b6eed732aa88fc60a7bacd8ff0ce98.tar.bz2
forums-b6e5a5fca8b6eed732aa88fc60a7bacd8ff0ce98.tar.xz
forums-b6e5a5fca8b6eed732aa88fc60a7bacd8ff0ce98.zip
[ticket/16127] Minimum 1 and rephrasing.
PHPBB3-16127
-rw-r--r--phpBB/includes/acp/acp_board.php2
-rw-r--r--phpBB/language/en/acp/board.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index c26a572590..41f0332036 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -450,7 +450,7 @@ class acp_board
'email_enable' => array('lang' => 'ENABLE_EMAIL', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true),
'board_email_form' => array('lang' => 'BOARD_EMAIL_FORM', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true),
'email_package_size' => array('lang' => 'EMAIL_PACKAGE_SIZE', 'validate' => 'int:0', 'type' => 'number:0:99999', 'explain' => true),
- 'email_max_chunk_size' => array('lang' => 'EMAIL_MAX_CHUNK_SIZE', 'validate' => 'int:0', 'type' => 'number:0:99999', 'explain' => true),
+ 'email_max_chunk_size' => array('lang' => 'EMAIL_MAX_CHUNK_SIZE', 'validate' => 'int:0', 'type' => 'number:1:99999', 'explain' => true),
'board_contact' => array('lang' => 'CONTACT_EMAIL', 'validate' => 'email', 'type' => 'email:25:100', 'explain' => true),
'board_contact_name' => array('lang' => 'CONTACT_EMAIL_NAME', 'validate' => 'string', 'type' => 'text:25:50', 'explain' => true),
'board_email' => array('lang' => 'ADMIN_EMAIL', 'validate' => 'email', 'type' => 'email:25:100', 'explain' => true),
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 1edffe779a..651b76625d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -568,8 +568,8 @@ $lang = array_merge($lang, array(
'EMAIL_FORCE_SENDER_EXPLAIN' => 'This will set the <samp>Return-Path</samp> to the from email address instead of using the local user and hostname of the server. This setting does not apply when using SMTP.<br><em><strong>Warning:</strong> Requires the user that the webserver runs as to be added as trusted user to the sendmail configuration.</em>',
'EMAIL_PACKAGE_SIZE' => 'Email package size',
'EMAIL_PACKAGE_SIZE_EXPLAIN' => 'This is the number of maximum emails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification emails.',
- 'EMAIL_MAX_CHUNK_SIZE' => 'Email maximum chunk size',
- 'EMAIL_MAX_CHUNK_SIZE_EXPLAIN' => 'Set this to not exceed the limit of allowed <strong>BCC</strong> recipients for one email.',
+ 'EMAIL_MAX_CHUNK_SIZE' => 'Maximum allowed email recipients',
+ 'EMAIL_MAX_CHUNK_SIZE_EXPLAIN' => 'If necessary, set this to not exceed the maximum number of recipients that your email server will allow in one email message.',
'EMAIL_SIG' => 'Email signature',
'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all emails the board sends.',
'ENABLE_EMAIL' => 'Enable board-wide emails',