diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-01-18 17:12:04 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-01-18 17:12:04 +0000 |
| commit | 00bbd7da38ef8469b7f1d52ebe939673fd9cf4ba (patch) | |
| tree | bdf4aa1d865e9eeaeac67d5b15794323b1e58370 | |
| parent | 4837645ac57c9c021df5714822569f5fa17a0afb (diff) | |
| download | brdo-00bbd7da38ef8469b7f1d52ebe939673fd9cf4ba.tar.gz brdo-00bbd7da38ef8469b7f1d52ebe939673fd9cf4ba.tar.bz2 | |
- Patch #658118 by David_Rothstein, carlos8f: overlay prevented enabling of other modules at the same time.
| -rw-r--r-- | modules/overlay/overlay.install | 3 | ||||
| -rw-r--r-- | modules/overlay/overlay.module | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/modules/overlay/overlay.install b/modules/overlay/overlay.install index 9d37e9b62..d70fc7c6d 100644 --- a/modules/overlay/overlay.install +++ b/modules/overlay/overlay.install @@ -14,6 +14,7 @@ */ function overlay_enable() { if (strpos(current_path(), 'admin/modules') === 0) { - drupal_goto('<front>', array('fragment' => 'overlay=admin/modules')); + // Flag for a redirect to <front>#overlay=admin/modules on hook_init(). + $_SESSION['overlay_enable_redirect'] = 1; } } diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module index 0162b583b..89ff57b9d 100644 --- a/modules/overlay/overlay.module +++ b/modules/overlay/overlay.module @@ -59,6 +59,13 @@ function overlay_init() { // Only act if the user has access to administration pages. Other modules can // also enable the overlay directly for other uses of the JavaScript. if (user_access('access overlay')) { + // After overlay is enabled on the modules page, redirect to + // <front>#overlay=admin/modules to actually enable the overlay. + if (isset($_SESSION['overlay_enable_redirect']) && $_SESSION['overlay_enable_redirect']) { + unset($_SESSION['overlay_enable_redirect']); + drupal_goto('<front>', array('fragment' => 'overlay=' . current_path())); + } + if (isset($_GET['render']) && $_GET['render'] == 'overlay') { // If this page shouldn't be rendered here, redirect to the parent. if (!path_is_admin($_GET['q'])) { |