diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-09-23 22:44:13 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-09-23 22:44:13 +0200 |
| commit | 0c144b98a417d50b9c073ae3931fdad47390f1f7 (patch) | |
| tree | e1a94ada7e5e06fc7c21de13dbb3f86f88634ec7 /program/steps | |
| parent | 8f098e8dead85b6512ac72b2d805314baec72a2f (diff) | |
| parent | e695162ef76054050e4181e4d28f28cf1981386b (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/addressbook/edit.inc | 7 | ||||
| -rw-r--r-- | program/steps/addressbook/func.inc | 5 | ||||
| -rw-r--r-- | program/steps/addressbook/import.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc index 90069a7eb..b216a7c70 100644 --- a/program/steps/addressbook/edit.inc +++ b/program/steps/addressbook/edit.inc @@ -244,11 +244,12 @@ function rcmail_source_selector($attrib) if (count($sources_list) < 2) { $source = $sources_list[$SOURCE_ID]; $hiddenfield = new html_hiddenfield(array('name' => '_source', 'value' => $SOURCE_ID)); - return html::span($attrib, Q($source['name']) . $hiddenfield->show()); + return html::span($attrib, $source['name'] . $hiddenfield->show()); } - $attrib['name'] = '_source'; - $attrib['onchange'] = JS_OBJECT_NAME . ".command('save', 'reload', this.form)"; + $attrib['name'] = '_source'; + $attrib['is_escaped'] = true; + $attrib['onchange'] = JS_OBJECT_NAME . ".command('save', 'reload', this.form)"; $select = new html_select($attrib); diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 5f5fcc673..4ef4d1b51 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -178,7 +178,7 @@ function rcmail_set_sourcename($abook) if (!$name && $source == 0) { $name = rcube_label('personaladrbook'); } - $OUTPUT->set_env('sourcename', $name); + $OUTPUT->set_env('sourcename', html_entity_decode($name, ENT_COMPAT, 'UTF-8')); } } @@ -219,12 +219,13 @@ function rcmail_directory_list($attrib) if ($source['class_name']) $class_name .= ' ' . $source['class_name']; + $name = !empty($source['name']) ? $source['name'] : $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, $name); $groupdata = array('out' => $out, 'jsdata' => $jsdata, 'source' => $id); if ($source['groups']) diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc index 15e04b82a..fb2251f18 100644 --- a/program/steps/addressbook/import.inc +++ b/program/steps/addressbook/import.inc @@ -43,7 +43,7 @@ function rcmail_import_form($attrib) // addressbook selector if (count($writable_books) > 1) { - $select = new html_select(array('name' => '_target', 'id' => 'rcmimporttarget')); + $select = new html_select(array('name' => '_target', 'id' => 'rcmimporttarget', 'is_escaped' => true)); foreach ($writable_books as $book) $select->add($book['name'], $book['id']); 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( |