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

1 files changed, 9 insertions, 12 deletions

diff --git a/modules/system/system.module b/modules/system/system.module
index ce2b15767..a0a9759e3 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -235,6 +235,15 @@ function system_menu($may_cache) {
       'description' => t('Enable or disable clean URLs for your site.'),
       '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;
 }
@@ -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.
  *