diff options
| -rw-r--r-- | modules/overlay/overlay-parent.js | 2 | ||||
| -rw-r--r-- | modules/overlay/overlay.module | 2 | ||||
| -rw-r--r-- | modules/toolbar/toolbar.module | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index 33cc598fc..3007fe088 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -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. diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module index 2b2b31124..fa5e76af0 100644 --- a/modules/overlay/overlay.module +++ b/modules/overlay/overlay.module @@ -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(); } } diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module index fa0782a7e..348c0a29e 100644 --- a/modules/toolbar/toolbar.module +++ b/modules/toolbar/toolbar.module @@ -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'])) { |