diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:39:04 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:39:04 +0100 |
| commit | 678ec7b545e6780b1192d6fdf358692c9431bb17 (patch) | |
| tree | 08f0c6e932673e4bfab7948d21a7b6401f0fe7f7 /phpBB/includes | |
| parent | f29bebc7ce367dda4851c83d78e2a61428f63c9d (diff) | |
| parent | 5aec7600a68adb9466fb7ce034ba22070ac8a244 (diff) | |
| download | forums-678ec7b545e6780b1192d6fdf358692c9431bb17.tar forums-678ec7b545e6780b1192d6fdf358692c9431bb17.tar.gz forums-678ec7b545e6780b1192d6fdf358692c9431bb17.tar.bz2 forums-678ec7b545e6780b1192d6fdf358692c9431bb17.tar.xz forums-678ec7b545e6780b1192d6fdf358692c9431bb17.zip | |
Merge remote-tracking branch 'github-exreaction/ticket/10896' into develop-olympus
* github-exreaction/ticket/10896:
[ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
[ticket/10896] Adds email validation to email settings in ACP
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 f437dca8f9..ebbf66657e 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -408,8 +408,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), |