mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 19:15:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10198] range validation for strings should limit characters not bytes
  [ticket/10198] validate_config_vars() improperly validates multibyte strings

Conflicts:
	phpBB/adm/index.php
This commit is contained in:
Andreas Fischer
2011-06-10 01:24:16 +02:00
parent ca1944ebe2 a4f7002995
commit df52801989
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_acp.php
View File

@ -329,7 +329,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
switch ($validator[$type]) switch ($validator[$type])
{ {
case 'string': case 'string':
$length = strlen($cfg_array[$config_name]); $length = utf8_strlen($cfg_array[$config_name]);
// the column is a VARCHAR // the column is a VARCHAR
$validator[$max] = (isset($validator[$max])) ? min(255, $validator[$max]) : 255; $validator[$max] = (isset($validator[$max])) ? min(255, $validator[$max]) : 255;
@ -527,7 +527,7 @@ function validate_range($value_ary, &$error)
{ {
case 'string' : case 'string' :
$max = (isset($column[1])) ? min($column[1],$type['max']) : $type['max']; $max = (isset($column[1])) ? min($column[1],$type['max']) : $type['max'];
if (strlen($value['value']) > $max) if (utf8_strlen($value['value']) > $max)
{ {
$error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$value['lang']], $max); $error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$value['lang']], $max);
} }