diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-09-20 15:46:11 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-09-20 15:46:11 +0200 |
| commit | 5802cfec95fc05f5ccab2c85ab225ffeaf1e5874 (patch) | |
| tree | 2c48f63f281f1549eb62f4a38b16aec40b92afd0 /program/steps | |
| parent | 4ca72140858e0b16fbfcba9042dd32f2465dc6d1 (diff) | |
Support HTML entities in addressbook names
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/addressbook/func.inc | 3 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 5f5fcc673..44d216c25 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -219,12 +219,13 @@ function rcmail_directory_list($attrib) if ($source['class_name']) $class_name .= ' ' . $source['class_name']; + $name = !empty($source['name']) ? html_entity_decode($source['name'], ENT_COMPAT, 'UTF-8') : $id; $out .= sprintf($line_templ, html_identifier($id), $class_name, Q(rcmail_url(null, array('_source' => $id))), $source['id'], - $js_id, (!empty($source['name']) ? Q($source['name']) : Q($id))); + $js_id, Q($name)); $groupdata = array('out' => $out, 'jsdata' => $jsdata, 'source' => $id); if ($source['groups']) diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 59b4e3735..4f8da1350 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -667,7 +667,7 @@ function rcmail_user_prefs($current=null) $select_abook = new html_select(array('name' => '_default_addressbook', 'id' => $field_id)); foreach ($books as $book) { - $select_abook->add($book['name'], $book['id']); + $select_abook->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']); } $blocks['main']['options']['default_addressbook'] = array( |