aboutsummaryrefslogtreecommitdiff
path: root/actions/profile/edit.php
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2012-11-11 19:37:40 -0500
committerSteve Clay <steve@mrclay.org>2012-11-11 19:37:40 -0500
commita73df942c5e863996358cb28f31eddaea7f0bdb8 (patch)
tree59366971c4abe2249b90fdf7e29d726d8b513c76 /actions/profile/edit.php
parentcf78b4d7b4b9a8a3c57cea779aeca9cbe7ace7ed (diff)
parent6648304aa71067a05b0d4166396f5f93c0f66628 (diff)
downloadelgg-a73df942c5e863996358cb28f31eddaea7f0bdb8.tar.gz
elgg-a73df942c5e863996358cb28f31eddaea7f0bdb8.tar.bz2
Merge branch '4593-18' into 1.8
Diffstat (limited to 'actions/profile/edit.php')
-rw-r--r--actions/profile/edit.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/profile/edit.php b/actions/profile/edit.php
index b6d73ff2d..89bf2bc0b 100644
--- a/actions/profile/edit.php
+++ b/actions/profile/edit.php
@@ -25,7 +25,7 @@ if (!is_array($accesslevel)) {
* wrapper for recursive array walk decoding
*/
function profile_array_decoder(&$v) {
- $v = html_entity_decode($v, ENT_COMPAT, 'UTF-8');
+ $v = _elgg_html_decode($v);
}
$profile_fields = elgg_get_config('profile_fields');
@@ -37,7 +37,7 @@ foreach ($profile_fields as $shortname => $valuetype) {
if (is_array($value)) {
array_walk_recursive($value, 'profile_array_decoder');
} else {
- $value = html_entity_decode($value, ENT_COMPAT, 'UTF-8');
+ $value = _elgg_html_decode($value);
}
// limit to reasonable sizes