mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
This commit is contained in:
Marc Alexander
2016-01-08 16:39:33 +01:00
parent b6fee9f536 2ab7b12419
commit 0028ed3e95
5 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_users.php
View File

@@ -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'),

2
phpBB/includes/ucp/ucp_prefs.php
View File

@@ -86,7 +86,7 @@ class ucp_prefs
}
$error = array_merge(validate_data($data, array(
'dateformat' => array('string', false, 1, 30),
'dateformat' => array('string', false, 1, 64),
'lang' => array('language_iso_name'),
'tz' => array('timezone'),
)), $error);