diff options
| author | robocoder <anthon.pang@gmail.com> | 2012-03-05 02:04:41 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2012-03-05 02:04:41 +0400 |
| commit | 884e54cf378bffdea2dd5360af8a260b25352746 (patch) | |
| tree | 83fe77732234c1c3e858501ab9ab200989732df1 /piwik.php | |
| parent | 775978937e1e393ba764968d5d41f261b488b8a8 (diff) | |
refs #1713 - merge dev branch to trunk (config class refactoring)
git-svn-id: http://dev.piwik.org/svn/trunk@5951 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'piwik.php')
| -rw-r--r-- | piwik.php | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -42,7 +42,7 @@ require_once PIWIK_INCLUDE_PATH .'/core/Plugin.php'; require_once PIWIK_INCLUDE_PATH .'/core/Common.php'; require_once PIWIK_INCLUDE_PATH .'/core/IP.php'; require_once PIWIK_INCLUDE_PATH .'/core/Tracker.php'; -require_once PIWIK_INCLUDE_PATH .'/core/Tracker/Config.php'; +require_once PIWIK_INCLUDE_PATH .'/core/Config.php'; require_once PIWIK_INCLUDE_PATH .'/core/Tracker/Db.php'; require_once PIWIK_INCLUDE_PATH .'/core/Tracker/IgnoreCookie.php'; require_once PIWIK_INCLUDE_PATH .'/core/Tracker/Visit.php'; @@ -68,12 +68,7 @@ if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) set_exception_handler('Piwik_ExceptionHandler'); printDebug("Debug enabled - Input parameters: <br/>" . var_export($_GET, true)); Piwik_Tracker_Db::enableProfiling(); - // Config might have been created by proxy-piwik.php - try { - $config = Zend_Registry::get('config'); - } catch (Exception $e) { - Piwik::createConfigObject(); - } + Piwik::createConfigObject(); Piwik::createLogObject(); } |