diff options
author | diosmosis <benaka@piwik.pro> | 2014-10-30 06:40:08 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2014-10-30 06:42:04 +0300 |
commit | fc275473b876c55af3f326c27a3f76813589e7aa (patch) | |
tree | a9b2a7e1eb56384aeb46ee90b5e86381643800a6 | |
parent | dd642bc8af1372d7dfeab7728c0e0f6b926f29e4 (diff) |
Fix regression in error page that occurs when custom logo URLs cannot be accessed (due to DB connect error).
-rw-r--r-- | core/FrontController.php | 12 |
1 files changed, 11 insertions, 1 deletions
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. |