diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-13 23:03:31 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-13 23:03:31 +0000 |
| commit | 0c79ed846d2763ca0152bba3724e0175f3f3eb7a (patch) | |
| tree | 9447521710fb94b8294430c87dd2a868784ae9aa | |
| parent | 4fd358ed735f77cdf876790d352f455c804d4806 (diff) | |
| download | brdo-0c79ed846d2763ca0152bba3724e0175f3f3eb7a.tar.gz brdo-0c79ed846d2763ca0152bba3724e0175f3f3eb7a.tar.bz2 | |
#649224 by David_Rothstein and ksenzee: Fixed Cannot run certain batch processes (tests, update manager, etc) with the overlay enabled.
| -rw-r--r-- | modules/overlay/overlay.module | 4 | ||||
| -rw-r--r-- | modules/system/system.module | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module index 2e86955b3..2f7f77a97 100644 --- a/modules/overlay/overlay.module +++ b/modules/overlay/overlay.module @@ -517,8 +517,8 @@ function overlay_request_dialog_close($value = NULL) { * The path that should open in the parent window after the overlay closes. */ function overlay_close_dialog($redirect = NULL) { - if (empty($redirect)) { - $path = $_GET['q']; + if (!isset($redirect)) { + $redirect = current_path(); } $settings = array( 'overlayChild' => array( diff --git a/modules/system/system.module b/modules/system/system.module index 58d135ffb..ba88f5678 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -3591,6 +3591,7 @@ function system_admin_paths() { $paths = array( 'admin' => TRUE, 'admin/*' => TRUE, + 'batch' => TRUE, ); return $paths; } |