diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:42:14 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:42:14 +0100 |
| commit | 5361a14c1ed2a39db10df9252488185e6ad3c6ff (patch) | |
| tree | a8f94c9de00aa1e7d905679f9828fff0aa58f60b /phpBB/includes | |
| parent | 0fdbdd01fb57ce2fcfe234ee7a99ab3740ea9db5 (diff) | |
| parent | 678ec7b545e6780b1192d6fdf358692c9431bb17 (diff) | |
| download | forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.tar forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.tar.gz forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.tar.bz2 forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.tar.xz forums-5361a14c1ed2a39db10df9252488185e6ad3c6ff.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
[ticket/10896] Adds email validation to email settings in ACP
Conflicts:
phpBB/adm/index.php
phpBB/language/en/common.php
phpBB/language/en/ucp.php
Diffstat (limited to 'phpBB/includes')
| -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 322e1c55d8..960cc89db5 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -413,8 +413,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), |