Index: admin.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin/admin.module,v
retrieving revision 1.1.2.23
diff -u -p -r1.1.2.23 admin.module
--- admin.module	30 Jul 2009 14:41:34 -0000	1.1.2.23
+++ admin.module	4 Nov 2009 21:07:09 -0000
@@ -25,18 +25,20 @@ function admin_init() {
   $admin_theme = variable_get('admin_theme', 'slate');
 
   // Initialize the slate theme. Bypass the theme system entirely so we can load our own theme into place.
-  if (variable_get('node_admin_theme', 0) && (strpos($_GET['q'], 'node/add') === 0 || strpos($_GET['q'], 'admin/content/add') === 0 || (arg(0) == 'node' && arg(2) == 'edit'))) {
-    _admin_init_theme();
-  }
-  else if (arg(0) == 'admin' && ($admin_theme == 'slate' || empty($admin_theme))) {
-    if (strpos($_GET['q'], 'admin/build/block') === 0) {
-      if (in_array(arg(3), array('configure', 'delete', 'add'), TRUE)) {
+  if ($admin_theme == 'slate' || empty($admin_theme)) {
+    if (variable_get('node_admin_theme', 0) && (strpos($_GET['q'], 'node/add') === 0 || strpos($_GET['q'], 'admin/content/add') === 0 || (arg(0) == 'node' && arg(2) == 'edit'))) {
+      _admin_init_theme();
+    }
+    else if (arg(0) == 'admin') {
+      if (strpos($_GET['q'], 'admin/build/block') === 0) {
+        if (in_array(arg(3), array('configure', 'delete', 'add'), TRUE)) {
+          _admin_init_theme();
+        }
+      }
+      else {
         _admin_init_theme();
       }
     }
-    else {
-      _admin_init_theme();
-    }
   }
   else if (function_exists('admin_theme_init') && $GLOBALS['custom_theme'] == 'slate') {
     _admin_init_theme();