diff options
author | diosmosis <benaka@piwik.pro> | 2015-04-27 00:59:50 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2015-04-27 00:59:50 +0300 |
commit | db4874776aa839bc8ed1f70bcbd7712acc741746 (patch) | |
tree | 1b374298563c2f2a31228f4ffc5d35b23eb29fad /piwik.php | |
parent | 1760412a370823f96eeed21d730acf8f4038c843 (diff) | |
parent | ad93a77498cb03ae8f4c52c292d3b584f67c458e (diff) |
Merge branch 'master' into config_step_2
Conflicts:
core/Console.php
piwik.php
Diffstat (limited to 'piwik.php')
-rw-r--r-- | piwik.php | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -52,7 +52,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Cookie.php'; // TODO should move to Tracker application class later. currently needed for environment validation. SettingsServer::setIsTrackerApiRequest(); -$environment = new \Piwik\Application\Environment(null); +$environment = new \Piwik\Application\Environment('tracker'); $environment->init(); Tracker::loadTrackerEnvironment(); |