Commit abba9b3b authored by Dries's avatar Dries

- Patch #725734 by casey, David_Rothstein, recidive, jpmckinney, aspilicious:...

- Patch #725734 by casey, David_Rothstein, recidive, jpmckinney, aspilicious: overlay doesn't escape any page titles (residual cleanup).
parent 83e9590a
......@@ -275,7 +275,7 @@ Drupal.overlay.loadChild = function (event) {
this.activeFrame = $(iframe)
.addClass('overlay-active')
// Add a title attribute to the iframe for accessibility.
.attr('title', Drupal.t('@title dialog', { '@title': iframeWindow.document.title }));;
.attr('title', Drupal.t('@title dialog', { '@title': iframeWindow.jQuery('#overlay-title').text() }));
this.inactiveFrame = event.data.sibling;
// Load an empty document into the inactive iframe.
......
......@@ -285,8 +285,6 @@ function overlay_preprocess_html(&$variables) {
if (overlay_get_mode() == 'child') {
// Add overlay class, so themes can react to being displayed in the overlay.
$variables['classes_array'][] = 'overlay';
// Do not include site name or slogan in the overlay title.
$variables['head_title'] = drupal_get_title();
}
}
......
......@@ -309,7 +309,7 @@ function toolbar_menu_navigation_links($tree) {
$link = $item['link']['localized_options'];
$link['href'] = $item['link']['href'];
// Add icon placeholder.
$link['title'] = '<span class="icon"></span>' . $item['link']['title'];
$link['title'] = '<span class="icon"></span>' . check_plain($item['link']['title']);
// Add admin link ID.
$link['attributes'] = array('id' => 'toolbar-link-' . $id);
if (!empty($item['link']['description'])) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment