From 68347691b0c7fb3f81415abd7fcdc5aec85cc554 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 1 Mar 2010 21:53:10 -0500
Subject: [PATCH] Don't attempt to retrieve the current user from the DB while
 processing a DB error

---
 index.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/index.php b/index.php
index 88658a3ad6..215d1f676e 100644
--- a/index.php
+++ b/index.php
@@ -92,6 +92,12 @@ function handleError($error)
             || $error instanceof DB_Error
             || ($error instanceof PEAR_Exception && $error->getCode() == -24)
         ) {
+            //If we run into a DB error, assume we can't connect to the DB at all
+            //so set the current user to null, so we don't try to access the DB
+            //while rendering the error page.
+            global $_cur;
+            $_cur = null;
+
             $msg = sprintf(
                 _(
                     'The database for %s isn\'t responding correctly, '.