From fc275473b876c55af3f326c27a3f76813589e7aa Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Wed, 29 Oct 2014 20:40:08 -0700
Subject: Fix regression in error page that occurs when custom logo URLs cannot
 be accessed (due to DB connect error).

---
 core/FrontController.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'core/FrontController.php')

diff --git a/core/FrontController.php b/core/FrontController.php
index e61e37d21d..33dab49e47 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -621,7 +621,17 @@ class FrontController extends Singleton
         }
 
         $logo = new CustomLogo();
-        $result = Piwik_GetErrorMessagePage($message, $debugTrace, true, true, $logo->getHeaderLogoUrl(), $logo->getPathUserFavicon());
+
+        $logoHeaderUrl = false;
+        $logoFaviconUrl = false;
+        try {
+            $logoHeaderUrl = $logo->getHeaderLogoUrl();
+            $logoFaviconUrl = $logo->getPathUserFavicon();
+        } catch (Exception $ex) {
+            Log::debug($ex);
+        }
+
+        $result = Piwik_GetErrorMessagePage($message, $debugTrace, true, true, $logoHeaderUrl, $logoFaviconUrl);
 
         /**
          * Triggered before a Piwik error page is displayed to the user.
-- 
cgit v1.2.3