Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-12-15 05:38:32 +0300
committermattab <matthieu.aubry@gmail.com>2014-12-15 05:38:32 +0300
commit4d0cc39b96a86db5947fb8da897a1d5016ed3d18 (patch)
tree0750eb5a6d2c5296ea49bffa3ba1467a60b8ce84 /piwik.php
parent40008178277b364ff5da36a4fc687160384f0241 (diff)
Fixes #6841 - catch the exception when loading tracker environment to prevent error on screen
Diffstat (limited to 'piwik.php')
-rw-r--r--piwik.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/piwik.php b/piwik.php
index 271825f81a..edce11447e 100644
--- a/piwik.php
+++ b/piwik.php
@@ -67,11 +67,15 @@ require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Cache.php';
require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Request.php';
require_once PIWIK_INCLUDE_PATH . '/core/Cookie.php';
-Tracker::loadTrackerEnvironment();
-
session_cache_limiter('nocache');
@date_default_timezone_set('UTC');
+try {
+ Tracker::loadTrackerEnvironment();
+} catch (Exception $e) {
+ // eg. Piwik is not installed yet
+}
+
$tracker = new Tracker();
$requestSet = new RequestSet();