diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
| commit | a01da0c1ee83d15e4c466a80db78fd7e9859e637 (patch) | |
| tree | 651cd313ae0d225d67fb0a4f1755d7f87b2546b7 /phpBB/includes/acp/acp_board.php | |
| parent | d2295b3d1f191710916b12980e13c97419ecf0ae (diff) | |
| parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
| download | forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.gz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.bz2 forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.xz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/acp/acp_board.php')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index aed27d7122..a213102cc6 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -414,8 +414,8 @@ class acp_board 'board_email_form' => array('lang' => 'BOARD_EMAIL_FORM', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true), 'email_function_name' => array('lang' => 'EMAIL_FUNCTION_NAME', 'validate' => 'string', 'type' => 'text:20:50', 'explain' => true), 'email_package_size' => array('lang' => 'EMAIL_PACKAGE_SIZE', 'validate' => 'int:0', 'type' => 'text:5:5', 'explain' => true), - 'board_contact' => array('lang' => 'CONTACT_EMAIL', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true), - 'board_email' => array('lang' => 'ADMIN_EMAIL', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true), + 'board_contact' => array('lang' => 'CONTACT_EMAIL', 'validate' => 'email', 'type' => 'text:25:100', 'explain' => true), + 'board_email' => array('lang' => 'ADMIN_EMAIL', 'validate' => 'email', 'type' => 'text:25:100', '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), |