aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-17 13:33:23 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-03-17 13:33:23 +0100
commitee754dfab1114b1606c8299274627aeae01746bb (patch)
tree1302975c307586f2bf0fbc9f2402b53d1cfb40ca /phpBB/phpbb
parentec25eba444f338264c38869a23042c98d0d672ce (diff)
parent8a48f6e2673ca7ffe050e80e7387c1bf983414ed (diff)
downloadforums-ee754dfab1114b1606c8299274627aeae01746bb.tar
forums-ee754dfab1114b1606c8299274627aeae01746bb.tar.gz
forums-ee754dfab1114b1606c8299274627aeae01746bb.tar.bz2
forums-ee754dfab1114b1606c8299274627aeae01746bb.tar.xz
forums-ee754dfab1114b1606c8299274627aeae01746bb.zip
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
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/profilefields/type/type_string_common.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
index 0738cbdafd..78e219a61f 100644
--- a/phpBB/phpbb/profilefields/type/type_string_common.php
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -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']));
}