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 /core/TablePartitioning.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 'core/TablePartitioning.php')
| -rw-r--r-- | core/TablePartitioning.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/TablePartitioning.php b/core/TablePartitioning.php index 5473d20a49..84e7761bbf 100644 --- a/core/TablePartitioning.php +++ b/core/TablePartitioning.php @@ -72,8 +72,8 @@ abstract class Piwik_TablePartitioning $db = Zend_Registry::get('db'); $sql = Piwik::getTableCreateSql($this->tableName); - $config = Zend_Registry::get('config'); - $prefixTables = $config->database->tables_prefix; + $config = Piwik_Config::getInstance(); + $prefixTables = $config->database['tables_prefix']; $sql = str_replace( $prefixTables . $this->tableName, $this->generatedTableName, $sql); try { $db->query( $sql ); @@ -109,8 +109,8 @@ class Piwik_TablePartitioning_Monthly extends Piwik_TablePartitioning } protected function generateTableName() { - $config = Zend_Registry::get('config'); - return $config->database->tables_prefix . $this->tableName . "_" . date("Y_m", $this->timestamp); + $config = Piwik_Config::getInstance(); + return $config->database['tables_prefix'] . $this->tableName . "_" . date("Y_m", $this->timestamp); } } @@ -128,7 +128,7 @@ class Piwik_TablePartitioning_Daily extends Piwik_TablePartitioning } protected function generateTableName() { - $config = Zend_Registry::get('config'); - return $config->database->tables_prefix . $this->tableName . "_" . date("Y_m_d", $this->timestamp); + $config = Piwik_Config::getInstance(); + return $config->database['tables_prefix'] . $this->tableName . "_" . date("Y_m_d", $this->timestamp); } } |