aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-12-16 18:32:55 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-12-16 18:32:55 +0100
commit4bbda5bc4551c8b7ff3755a8bdb457aa30aebc24 (patch)
tree8cfdd77a70bcba335f872da31f61be2ba996c46c /phpBB/includes/acp
parent4e045ed767603547d6aa9126d22a42bd690a1dd1 (diff)
downloadforums-4bbda5bc4551c8b7ff3755a8bdb457aa30aebc24.tar
forums-4bbda5bc4551c8b7ff3755a8bdb457aa30aebc24.tar.gz
forums-4bbda5bc4551c8b7ff3755a8bdb457aa30aebc24.tar.bz2
forums-4bbda5bc4551c8b7ff3755a8bdb457aa30aebc24.tar.xz
forums-4bbda5bc4551c8b7ff3755a8bdb457aa30aebc24.zip
[ticket/15322] Adjust email language and move force sender setting
PHPBB3-15322
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_board.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 57770f12c3..d2a4262e36 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -444,11 +444,11 @@ class acp_board
'legend1' => 'GENERAL_SETTINGS',
'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_force_sender' => array('lang' => 'EMAIL_FORCE_SENDER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'email_package_size' => array('lang' => 'EMAIL_PACKAGE_SIZE', 'validate' => 'int:0', 'type' => 'number:0: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),
+ 'email_force_sender' => array('lang' => 'EMAIL_FORCE_SENDER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'board_email_sig' => array('lang' => 'EMAIL_SIG', 'validate' => 'string', 'type' => 'textarea:5:30', 'explain' => true),
'board_hide_emails' => array('lang' => 'BOARD_HIDE_EMAILS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'send_test_email' => array('lang' => 'SEND_TEST_EMAIL', 'validate' => 'bool', 'type' => 'custom', 'method' => 'send_test_email', 'explain' => true),