diff options
| -rw-r--r-- | includes/form.inc | 3 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/includes/form.inc b/includes/form.inc index a80460477..83e37c385 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -2890,6 +2890,8 @@ function batch_set($batch_definition) { function batch_process($redirect = NULL, $url = NULL) { $batch =& batch_get(); + drupal_theme_initialize(); + if (isset($batch)) { // Add process information $url = isset($url) ? $url : 'batch'; @@ -2899,6 +2901,7 @@ function batch_process($redirect = NULL, $url = NULL) { 'url' => isset($url) ? $url : 'batch', 'source_page' => $_GET['q'], 'redirect' => $redirect, + 'theme' => $GLOBALS['theme_key'], ); $batch += $process_info; diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index bd7f54eff..b4aa10446 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1928,6 +1928,11 @@ function system_php() { function system_batch_page() { require_once DRUPAL_ROOT . '/includes/batch.inc'; $output = _batch_page(); + + // Use the same theme that the page that started the batch. + $batch = &batch_get(); + $GLOBALS['custom_theme'] = $batch['theme']; + if ($output === FALSE) { drupal_access_denied(); } |