1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge remote-tracking branch 'dragooon/ticket/9040' into develop

* dragooon/ticket/9040:
  [ticket/9040] Minor cleanup in the unit test file
  [ticket/9040] Count HTML entities as single in custom profile fields
This commit is contained in:
Joas Schilling
2014-03-17 13:33:23 +01:00
2 changed files with 117 additions and 1 deletions

View File

@@ -65,7 +65,7 @@ abstract class type_string_common extends type_base
{
return $this->user->lang('FIELD_TOO_SHORT', (int) $field_data['field_minlen'], $this->get_field_name($field_data['lang_name']));
}
else if ($field_data['field_maxlen'] && utf8_strlen($field_value) > $field_data['field_maxlen'])
else if ($field_data['field_maxlen'] && utf8_strlen(html_entity_decode($field_value)) > $field_data['field_maxlen'])
{
return $this->user->lang('FIELD_TOO_LONG', (int) $field_data['field_maxlen'], $this->get_field_name($field_data['lang_name']));
}