diff options
| author | Fabian Becker <fabian.becker@uni-tuebingen.de> | 2013-07-18 13:25:08 +0400 |
|---|---|---|
| committer | Fabian Becker <fabian.becker@uni-tuebingen.de> | 2013-07-18 13:25:08 +0400 |
| commit | 879d0e094824bd6d46ca1ecbba1cda945394bb05 (patch) | |
| tree | 038ad7cbfe1e6441ada4e5a979ec54331d910f42 /plugins/Actions | |
| parent | df0fd261c9172926a8a2a9a05fd4b30bd840d5f7 (diff) | |
Refactor Piwik_Config to \Piwik\Core\Config
2 steps required:
1. Refactor > Move > \Piwik\Core\Config (uncheck "Create new File")
2. Refactor > Rename > Piwik_Config to Config
Diffstat (limited to 'plugins/Actions')
| -rw-r--r-- | plugins/Actions/Archiver.php | 3 | ||||
| -rw-r--r-- | plugins/Actions/ArchivingHelper.php | 15 |
2 files changed, 10 insertions, 8 deletions
diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index 61f9cc3a86..0fa1f4f0e2 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_Actions */ +use Piwik\Core\Config; /** * Class encapsulating logic to process Day/Period Archiving for the Actions reports @@ -130,7 +131,7 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver */ private static function getRankingQueryLimit() { - $configGeneral = Piwik_Config::getInstance()->General; + $configGeneral = Config::getInstance()->General; $configLimit = $configGeneral['archiving_ranking_query_row_limit']; return $configLimit == 0 ? 0 : max( $configLimit, diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 0f7744522c..37e9e99122 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_Actions */ +use Piwik\Core\Config; /** * This static class provides: @@ -205,18 +206,18 @@ class Piwik_Actions_ArchivingHelper static public function reloadConfig() { // for BC, we read the old style delimiter first (see #1067)Row - $actionDelimiter = @Piwik_Config::getInstance()->General['action_category_delimiter']; + $actionDelimiter = @Config::getInstance()->General['action_category_delimiter']; if (empty($actionDelimiter)) { - self::$actionUrlCategoryDelimiter = Piwik_Config::getInstance()->General['action_url_category_delimiter']; - self::$actionTitleCategoryDelimiter = Piwik_Config::getInstance()->General['action_title_category_delimiter']; + self::$actionUrlCategoryDelimiter = Config::getInstance()->General['action_url_category_delimiter']; + self::$actionTitleCategoryDelimiter = Config::getInstance()->General['action_title_category_delimiter']; } else { self::$actionUrlCategoryDelimiter = self::$actionTitleCategoryDelimiter = $actionDelimiter; } - self::$defaultActionName = Piwik_Config::getInstance()->General['action_default_name']; + self::$defaultActionName = Config::getInstance()->General['action_default_name']; self::$columnToSortByBeforeTruncation = Piwik_Metrics::INDEX_NB_VISITS; - self::$maximumRowsInDataTableLevelZero = Piwik_Config::getInstance()->General['datatable_archiving_maximum_rows_actions']; - self::$maximumRowsInSubDataTable = Piwik_Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_actions']; + self::$maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_actions']; + self::$maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_actions']; Piwik_DataTable::setMaximumDepthLevelAllowedAtLeast(self::getSubCategoryLevelLimit() + 1); } @@ -412,7 +413,7 @@ class Piwik_Actions_ArchivingHelper */ public static function getSubCategoryLevelLimit() { - return Piwik_Config::getInstance()->General['action_category_level_limit']; + return Config::getInstance()->General['action_category_level_limit']; } /** |