diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-07-06 19:24:02 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-07-06 19:24:02 +0200 |
| commit | bb83af0a0a9589b8fab5e38e847e4372577fedaa (patch) | |
| tree | b4d933fe7f6ea40832500270ddd431cbeb4d5c0a /phpBB/includes/acp/acp_board.php | |
| parent | 51181c6ea1ac1b222c5ab6a5d7ec89c54fa9890f (diff) | |
| parent | cddb884be6c8a8890f4fbd7415763d46e51e050b (diff) | |
| download | forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.tar forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.tar.gz forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.tar.bz2 forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.tar.xz forums-bb83af0a0a9589b8fab5e38e847e4372577fedaa.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/acp/acp_board.php')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 7e42cc3d26..f487662da5 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -452,7 +452,7 @@ class acp_board 'legend2' => 'SMTP_SETTINGS', 'smtp_delivery' => array('lang' => 'USE_SMTP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'smtp_host' => array('lang' => 'SMTP_SERVER', 'validate' => 'string', 'type' => 'text:25:50', 'explain' => false), + 'smtp_host' => array('lang' => 'SMTP_SERVER', 'validate' => 'string', 'type' => 'text:25:50', 'explain' => true), 'smtp_port' => array('lang' => 'SMTP_PORT', 'validate' => 'int:0:99999', 'type' => 'number:0:99999', 'explain' => true), 'smtp_auth_method' => array('lang' => 'SMTP_AUTH_METHOD', 'validate' => 'string', 'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true), 'smtp_username' => array('lang' => 'SMTP_USERNAME', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true), |