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 /core/Common.php | |
| 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 'core/Common.php')
| -rw-r--r-- | core/Common.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/Common.php b/core/Common.php index b3f3560344..d9c9371c69 100644 --- a/core/Common.php +++ b/core/Common.php @@ -8,6 +8,7 @@ * @category Piwik * @package Piwik */ +use Piwik\Core\Config; /** * Static class providing functions used by both the CORE of Piwik and the visitor Tracking engine. @@ -62,7 +63,7 @@ class Piwik_Common */ public static function prefixTable($table) { - $prefix = Piwik_Config::getInstance()->database['tables_prefix']; + $prefix = Config::getInstance()->database['tables_prefix']; return $prefix . $table; } @@ -91,7 +92,7 @@ class Piwik_Common { static $prefixTable = null; if (is_null($prefixTable)) { - $prefixTable = Piwik_Config::getInstance()->database['tables_prefix']; + $prefixTable = Config::getInstance()->database['tables_prefix']; } if (empty($prefixTable) || strpos($table, $prefixTable) !== 0 @@ -671,7 +672,7 @@ class Piwik_Common { static $salt = null; if (is_null($salt)) { - $salt = @Piwik_Config::getInstance()->superuser['salt']; + $salt = @Config::getInstance()->superuser['salt']; } return $salt; } @@ -687,7 +688,7 @@ class Piwik_Common { static $hashAlgorithm = null; if (is_null($hashAlgorithm)) { - $hashAlgorithm = @Piwik_Config::getInstance()->General['hash_algorithm']; + $hashAlgorithm = @Config::getInstance()->General['hash_algorithm']; } if ($hashAlgorithm) { @@ -1130,8 +1131,8 @@ class Piwik_Common public static function getCampaignParameters() { $return = array( - Piwik_Config::getInstance()->Tracker['campaign_var_name'], - Piwik_Config::getInstance()->Tracker['campaign_keyword_var_name'], + Config::getInstance()->Tracker['campaign_var_name'], + Config::getInstance()->Tracker['campaign_keyword_var_name'], ); foreach ($return as &$list) { |