aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/upgrades
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 /engine/lib/upgrades
parentcf78b4d7b4b9a8a3c57cea779aeca9cbe7ace7ed (diff)
parent6648304aa71067a05b0d4166396f5f93c0f66628 (diff)
downloadelgg-a73df942c5e863996358cb28f31eddaea7f0bdb8.tar.gz
elgg-a73df942c5e863996358cb28f31eddaea7f0bdb8.tar.bz2
Merge branch '4593-18' into 1.8
Diffstat (limited to 'engine/lib/upgrades')
-rw-r--r--engine/lib/upgrades/2010052601.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/lib/upgrades/2010052601.php b/engine/lib/upgrades/2010052601.php
index 5b477910f..a9cca6dc5 100644
--- a/engine/lib/upgrades/2010052601.php
+++ b/engine/lib/upgrades/2010052601.php
@@ -9,14 +9,14 @@ $params = array('type' => 'group',
$groups = elgg_get_entities($params);
if ($groups) {
foreach ($groups as $group) {
- $group->name = html_entity_decode($group->name, ENT_COMPAT, 'UTF-8');
- $group->description = html_entity_decode($group->description, ENT_COMPAT, 'UTF-8');
- $group->briefdescription = html_entity_decode($group->briefdescription, ENT_COMPAT, 'UTF-8');
- $group->website = html_entity_decode($group->website, ENT_COMPAT, 'UTF-8');
+ $group->name = _elgg_html_decode($group->name);
+ $group->description = _elgg_html_decode($group->description);
+ $group->briefdescription = _elgg_html_decode($group->briefdescription);
+ $group->website = _elgg_html_decode($group->website);
if ($group->interests) {
$tags = $group->interests;
- foreach ($tags as $index=>$tag) {
- $tags[$index] = html_entity_decode($tag, ENT_COMPAT, 'UTF-8');
+ foreach ($tags as $index => $tag) {
+ $tags[$index] = _elgg_html_decode($tag);
}
$group->interests = $tags;
}