Skip to content
Snippets Groups Projects
Commit bda6fa2b authored by Dries Buytaert's avatar Dries Buytaert
Browse files

- Patch #76753 by Moshe: fatal eror during logout with page cache enabled.

parent b7647e6d
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
...@@ -235,6 +235,15 @@ function system_menu($may_cache) { ...@@ -235,6 +235,15 @@ function system_menu($may_cache) {
'description' => t('Enable or disable clean URLs for your site.'), 'description' => t('Enable or disable clean URLs for your site.'),
'callback' => 'system_clean_url_settings'); 'callback' => 'system_clean_url_settings');
} }
else {
/**
* Use the administrative theme if the user is looking at a page in the admin/* path.
*/
if (arg(0) == 'admin') {
global $custom_theme;
$custom_theme = variable_get('admin_theme', 'bluemarine');
}
}
return $items; return $items;
} }
...@@ -364,18 +373,6 @@ function system_admin_page_submit($form_id, $form_values) { ...@@ -364,18 +373,6 @@ function system_admin_page_submit($form_id, $form_values) {
} }
} }
/**
* Implementation of hook_init. This hook will set the theme to the
* administrative theme if the user is looking at a page in the
* admin/* tree.
*/
function system_init() {
if (arg(0) == 'admin') {
global $custom_theme;
$custom_theme = variable_get('admin_theme', 'bluemarine');
}
}
/* /*
* Returns a fieldset containing the theme select form. * Returns a fieldset containing the theme select form.
* *
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment