CRM-10612 - civicrmtheme - Don't perform extra theme-selection logic …

…when running civicrm/upgrade.
civicrm · Aug 6, 2012 · e5cd2cb · e5cd2cb
1 parent 6c760e4
commit e5cd2cb
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/drupal/modules/civicrmtheme/civicrmtheme.module b/drupal/modules/civicrmtheme/civicrmtheme.module
@@ -103,6 +103,9 @@ function civicrmtheme_custom_theme() {
   if (arg(0) != 'civicrm') {
     return;
   }
+  if (arg(1) == 'upgrade') {
+    return;
+  }
 
   $admin_theme = variable_get('civicrmtheme_theme_admin', 0);
   $public_theme = variable_get('civicrmtheme_theme_public', 0);