From d8f91382e802a2a510dfadde398e9d0766c9fb7b Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Fri, 11 Sep 2009 04:09:26 +0000
Subject: [PATCH] #539022 by dropcube: Use current theme during Batch API
processes.
---
includes/form.inc | 3 +++
modules/system/system.admin.inc | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/includes/form.inc b/includes/form.inc
index a80460477d6e..83e37c38570a 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 bd7f54effdee..b4aa10446cf7 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();
}
--
GitLab