diff options
| author | Steve Clay <steve@mrclay.org> | 2012-11-11 19:37:40 -0500 |
|---|---|---|
| committer | Steve Clay <steve@mrclay.org> | 2012-11-11 19:37:40 -0500 |
| commit | a73df942c5e863996358cb28f31eddaea7f0bdb8 (patch) | |
| tree | 59366971c4abe2249b90fdf7e29d726d8b513c76 /mod | |
| parent | cf78b4d7b4b9a8a3c57cea779aeca9cbe7ace7ed (diff) | |
| parent | 6648304aa71067a05b0d4166396f5f93c0f66628 (diff) | |
| download | elgg-a73df942c5e863996358cb28f31eddaea7f0bdb8.tar.gz elgg-a73df942c5e863996358cb28f31eddaea7f0bdb8.tar.bz2 | |
Merge branch '4593-18' into 1.8
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/blog/views/default/forms/blog/save.php | 2 | ||||
| -rw-r--r-- | mod/groups/actions/groups/edit.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php index 0aefae0d9..7c3265c8d 100644 --- a/mod/blog/views/default/forms/blog/save.php +++ b/mod/blog/views/default/forms/blog/save.php @@ -53,7 +53,7 @@ $excerpt_label = elgg_echo('blog:excerpt'); $excerpt_input = elgg_view('input/text', array( 'name' => 'excerpt', 'id' => 'blog_excerpt', - 'value' => html_entity_decode($vars['excerpt'], ENT_COMPAT, 'UTF-8') + 'value' => _elgg_html_decode($vars['excerpt']) )); $body_label = elgg_echo('blog:body'); 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') { |