- Patch #615138 by quicksketch, ksenzee, casey: overlay uses () global, but it doesn't exist anymore.

2 files changed, 3 insertions, 17 deletions

diff --git a/modules/overlay/overlay.api.php b/modules/overlay/overlay.api.php
index 499c157c3..dc056ca98 100644
--- a/modules/overlay/overlay.api.php
+++ b/modules/overlay/overlay.api.php
@@ -32,13 +32,8 @@ function hook_overlay_parent_initialize() {
  * within the confines of the overlay.
  */
 function hook_overlay_child_initialize() {
-  // Use a different theme for content administration pages.
-  if (arg(0) == 'admin' && arg(1) == 'content') {
-    if ($theme = variable_get('content_administration_pages_theme', FALSE)) {
-      global $custom_theme;
-      $custom_theme = $theme;
-    }
-  }
+  // Add our custom JavaScript.
+  drupal_add_js(drupal_get_path('module', 'hook') . '/hook-overlay-child.js');
 }
 
 /**
diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index 2650e8168..f65f32d8d 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -66,9 +66,6 @@ function overlay_theme() {
  * @see overlay_set_mode()
  */
 function overlay_init() {
-  // @todo: custom_theme does not exist anymore.
-  global $custom_theme;
-
   $mode = overlay_get_mode();
 
   // Only act if the user has access to the overlay and a mode was not already
@@ -87,13 +84,7 @@ function overlay_init() {
       if (!path_is_admin($current_path)) {
         overlay_close_dialog($current_path);
       }
-      // If system module did not switch the theme yet (i.e. this is not an
-      // admin page, per se), we should switch the theme here.
-      $admin_theme = variable_get('admin_theme', 0);
-      if ($custom_theme != $admin_theme) {
-        $custom_theme = $admin_theme;
-        drupal_add_css(drupal_get_path('module', 'system') . '/admin.css');
-      }
+
       // Indicate that we are viewing an overlay child page.
       overlay_set_mode('child');