From 7fd33ed2d3082f438dd7c1997f0e70dfc4a577f3 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 16 Feb 2010 00:27:34 +0000
Subject: #650528 by jide, casey, et al: Overlay should not appear when an
 administrative page is being viewed in the parent window.

---
 modules/overlay/overlay.module | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index 89ff57b9d..4bfa91743 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -84,7 +84,8 @@ function overlay_init() {
       // Unset the render parameter to avoid it being included in URLs on the page.
       unset($_GET['render']);
     }
-    else {
+    // Do not enable the overlay if we already are on an admin page.
+    else if (!path_is_admin(current_path())) {
       // Otherwise add overlay parent code and our behavior.
       overlay_set_mode('parent');
     }
-- 
cgit v1.2.3