From: JohnAlbin
Date: Fri, 13 Feb 2009 18:49:49 +0000 (+0000)
Subject: #275832: hook_theme implementation breaks maintenance page when database is down
X-Git-Tag: 6.x-1.0~6
X-Git-Url: http://drupalcode.org/project/zen.git/commitdiff_plain/8f13eb0b34c8743a77b7544255b1a79910a3b492

#275832: hook_theme implementation breaks maintenance page when database is down
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8731407..1a89cca 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,5 @@
 Zen 6.x-1.x-dev
+  #275832: hook_theme implementation breaks maintenance page when database is down
   #362104: layout breaks on Zen-themed maintenance page
   * Changed "or" back to "||" in template files since themers do need to learn a little PHP
   #346867 by debonator: navbar-inner is missing the "clear-block" class
@@ -73,7 +74,7 @@ Zen 6.x-1.0-beta1
   #248780: admin table styles override update_status styling
   #232840: OpenID login block displaying incorrectly
   #246110 by jjeff: zen.css breaks .container-inline
-  #229661: earch Box doesn't return any results or warnings
+  #229661: Search Box doesn't return any results or warnings
   #244023 by jjeff: Make block editing links go to actual menu edit pages
   #245968 by jjeff: Put the word "Comments" above comments
   #238387: Update README on how to edit the .info file
diff --git a/zen/template.php b/zen/template.php
index 9850ac9..bdb89c0 100644
--- a/zen/template.php
+++ b/zen/template.php
@@ -35,6 +35,9 @@ if ($GLOBALS['theme'] == 'zen') { // If we're in the main theme
  * Implements HOOK_theme().
  */
 function zen_theme(&$existing, $type, $theme, $path) {
+  if (!db_is_active()) {
+    return array();
+  }
   include_once './' . drupal_get_path('theme', 'zen') . '/template.theme-registry.inc';
   return _zen_theme($existing, $type, $theme, $path);
 }