Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-09-30 09:37:32 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-09-30 09:37:32 +0400
commita00487b0b841c4b15463b591c7f62176c4b84d15 (patch)
tree6eb893ce356a4740e044c9cdadaf84ffb2095b9d /core/Config.php
parent0edef3332289a7cbe54b58084b967907d1086d29 (diff)
coding style fixes, some PHPStorm inspection fixes, improved readability of code, few refactorings, all as part of our code cleanup strategy
Diffstat (limited to 'core/Config.php')
-rw-r--r--core/Config.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/Config.php b/core/Config.php
index 9d6326bb2e..572291b259 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -36,7 +36,7 @@ use Exception;
* Config::getInstance()->MySection = array('myoption' => 1);
* Config::getInstance()->forceSave();
*
- * @method static \Piwik\Config getInstance()
+ * @method static Config getInstance()
*/
class Config extends Singleton
{
@@ -416,9 +416,9 @@ class Config extends Singleton
$section = $this->getFromGlobalConfig($name);
$sectionCommon = $this->getFromCommonConfig($name);
- if(empty($section) && !empty($sectionCommon)) {
+ if (empty($section) && !empty($sectionCommon)) {
$section = $sectionCommon;
- } elseif(!empty($section) && !empty($sectionCommon)) {
+ } elseif (!empty($section) && !empty($sectionCommon)) {
$section = $this->array_merge_recursive_distinct($section, $sectionCommon);
}
@@ -559,7 +559,7 @@ class Config extends Singleton
}
// If there is a common.config.ini.php, this will ensure config.ini.php does not duplicate its values
- if(!empty($configCommon)) {
+ if (!empty($configCommon)) {
$configGlobal = $this->array_merge_recursive_distinct($configGlobal, $configCommon);
}