From 84c72d06f03163115ae9bbc939e6ab2dbc65eb28 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 27 Nov 2010 20:25:44 +0000
Subject: =?UTF-8?q?-=20Patch=20#669510=20by=20quicksketch,=20David=5FRoths?=
 =?UTF-8?q?tein,=20Dave=20Reid,=20casey,=20G=C3=A1bor=20Hojtsy,=20mrfelton?=
 =?UTF-8?q?,=20effulgentsia:=20merge=20administration=20theme=20with=20hoo?=
 =?UTF-8?q?k=5Fadmin=5Fpaths().?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/book/book.module | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules/book')

diff --git a/modules/book/book.module b/modules/book/book.module
index a59de8179..25f0254d2 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -174,7 +174,6 @@ function book_menu() {
     'page arguments' => array(1),
     'access callback' => '_book_outline_access',
     'access arguments' => array(1),
-    'theme callback' => '_node_custom_theme',
     'type' => MENU_LOCAL_TASK,
     'weight' => 2,
     'file' => 'book.pages.inc',
@@ -185,7 +184,6 @@ function book_menu() {
     'page arguments' => array('book_remove_form', 1),
     'access callback' => '_book_outline_remove_access',
     'access arguments' => array(1),
-    'theme callback' => '_node_custom_theme',
     'file' => 'book.pages.inc',
   );
 
@@ -210,11 +208,13 @@ function _book_outline_remove_access($node) {
  * Implements hook_admin_paths().
  */
 function book_admin_paths() {
-  $paths = array(
-    'node/*/outline' => TRUE,
-    'node/*/outline/remove' => TRUE,
-  );
-  return $paths;
+  if (variable_get('node_admin_theme')) {
+    $paths = array(
+      'node/*/outline' => TRUE,
+      'node/*/outline/remove' => TRUE,
+    );
+    return $paths;
+  }
 }
 
 /**
-- 
cgit v1.2.3