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 /misc/cron | |
| 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 'misc/cron')
| -rw-r--r-- | misc/cron/archive.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/misc/cron/archive.php b/misc/cron/archive.php index ccd8c079c2..f009d89632 100644 --- a/misc/cron/archive.php +++ b/misc/cron/archive.php @@ -555,9 +555,9 @@ class Archiving private function initLog() { - Zend_Registry::get('config')->disableSavingConfigurationFileUpdates(); - Zend_Registry::get('config')->log->log_only_when_debug_parameter = 0; - Zend_Registry::get('config')->log->logger_message = array("logger_message" => "screen"); + $config = Piwik_Config::getInstance(); + $config->log['log_only_when_debug_parameter'] = 0; + $config->log['logger_message'] = array("logger_message" => "screen"); Piwik::createLogObject(); if(!function_exists("curl_multi_init")) { @@ -729,8 +729,8 @@ class Archiving protected function initTokenAuth() { - $login = Zend_Registry::get('config')->superuser->login; - $md5Password = Zend_Registry::get('config')->superuser->password; + $login = Piwik_Config::getInstance()->superuser['login']; + $md5Password = Piwik_Config::getInstance()->superuser['password']; $this->token_auth = md5( $login . $md5Password ) ; $this->login = $login; } @@ -760,7 +760,7 @@ class Archiving $piwikUrl .= '/'; } } - if(Zend_Registry::get('config')->General->force_ssl == 1) + if(Piwik_Config::getInstance()->General['force_ssl'] == 1) { $piwikUrl = str_replace('http://', 'https://', $piwikUrl); } |