Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
228
Merge Requests
228
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
d8f91382
Commit
d8f91382
authored
Sep 11, 2009
by
webchick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#539022
by dropcube: Use current theme during Batch API processes.
parent
a667251e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
includes/form.inc
includes/form.inc
+3
-0
modules/system/system.admin.inc
modules/system/system.admin.inc
+5
-0
No files found.
includes/form.inc
View file @
d8f91382
...
...
@@ -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
;
...
...
modules/system/system.admin.inc
View file @
d8f91382
...
...
@@ -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
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment