diff options
author | Marc Alexander <admin@m-a-styles.de> | 2016-01-08 16:39:33 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-08 16:39:33 +0100 |
commit | 0028ed3e956f2d8e418e0cd26be34cff133ef672 (patch) | |
tree | e16b30e9bca56e17dbd5ab5a59bae5f6636086a1 /phpBB/includes/acp/acp_users.php | |
parent | b6fee9f536f01d85ae8233dd5259992ce6c6e143 (diff) | |
parent | 2ab7b124193ab87eeca8eef5d0e50eebd37d3336 (diff) | |
download | forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.gz forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.bz2 forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.xz forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.zip |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 32f5ffdc44..204c838c0f 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1627,7 +1627,7 @@ class acp_users if ($submit) { $error = validate_data($data, array( - 'dateformat' => array('string', false, 1, 30), + 'dateformat' => array('string', false, 1, 64), 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), 'tz' => array('timezone'), |