Don't attempt to retrieve the current user from the DB while processing a DB error

diff --git a/index.php b/index.php
index 88658a3ad6829132243ae867db9dcc743ec5c7fa..215d1f676e1f28dca36c2ae360fef123a6665097 100644 (file)
--- 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, '.