summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-02-16 00:27:34 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-02-16 00:27:34 +0000
commit7fd33ed2d3082f438dd7c1997f0e70dfc4a577f3 (patch)
treec265e5e1f3963039dafc5027a2405be2378c1423 /modules
parentbfe2c14b54be1f1b85c5c4b3d2007e8d93531438 (diff)
downloadbrdo-7fd33ed2d3082f438dd7c1997f0e70dfc4a577f3.tar.gz
brdo-7fd33ed2d3082f438dd7c1997f0e70dfc4a577f3.tar.bz2
#650528 by jide, casey, et al: Overlay should not appear when an administrative page is being viewed in the parent window.
Diffstat (limited to 'modules')
-rw-r--r--modules/overlay/overlay.module3
1 files changed, 2 insertions, 1 deletions
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');
}