aboutsummaryrefslogtreecommitdiff
path: root/mod/groups/actions
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-11-18 16:07:31 +0100
committerSem <sembrestels@riseup.net>2012-11-18 16:07:31 +0100
commit7f4f57ef1ebd8b97370094da2518dd39e183a43d (patch)
treee0a8518ee22c334ce5741c9247403cf09d179ec4 /mod/groups/actions
parent47aa87219deb97da16eabe03dee9179999faf2d7 (diff)
parent6623571b615fc5c9d1b82e2607de4cdaee8a818b (diff)
downloadelgg-7f4f57ef1ebd8b97370094da2518dd39e183a43d.tar.gz
elgg-7f4f57ef1ebd8b97370094da2518dd39e183a43d.tar.bz2
Merge tag '1.8.9' of git://github.com/Elgg/Elgg into lorea-preprod
Elgg 1.8.9 release
Diffstat (limited to 'mod/groups/actions')
-rw-r--r--mod/groups/actions/groups/edit.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php
index a4169461a..2d7e1f023 100644
--- a/mod/groups/actions/groups/edit.php
+++ b/mod/groups/actions/groups/edit.php
@@ -8,15 +8,15 @@
// Load configuration
global $CONFIG;
+elgg_make_sticky_form('groups');
+
/**
* 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);
}
-elgg_make_sticky_form('groups');
-
// Get group fields
$input = array();
foreach ($CONFIG->group as $shortname => $valuetype) {
@@ -25,7 +25,7 @@ foreach ($CONFIG->group as $shortname => $valuetype) {
if (is_array($input[$shortname])) {
array_walk_recursive($input[$shortname], 'profile_array_decoder');
} else {
- $input[$shortname] = html_entity_decode($input[$shortname], ENT_COMPAT, 'UTF-8');
+ $input[$shortname] = _elgg_html_decode($input[$shortname]);
}
if ($valuetype == 'tags') {