diff options
-rw-r--r-- | core/Tracker.php | 7 | ||||
-rw-r--r-- | piwik.php | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/core/Tracker.php b/core/Tracker.php index cb7b4494c5..fae00a57ef 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -62,7 +62,12 @@ class Tracker public static function loadTrackerEnvironment() { SettingsServer::setIsTrackerApiRequest(); - $GLOBALS['PIWIK_TRACKER_DEBUG'] = (bool) TrackerConfig::getConfigValue('debug'); + try { + $debug = (bool)TrackerConfig::getConfigValue('debug'); + } catch(Exception $e) { + $debug = false; + } + $GLOBALS['PIWIK_TRACKER_DEBUG'] = $debug; PluginManager::getInstance()->loadTrackerPlugins(); } @@ -70,11 +70,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Cookie.php'; session_cache_limiter('nocache'); @date_default_timezone_set('UTC'); -try { - Tracker::loadTrackerEnvironment(); -} catch (Exception $e) { - // eg. Piwik is not installed yet -} +Tracker::loadTrackerEnvironment(); $tracker = new Tracker(); $requestSet = new RequestSet(); |