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:
authorMartin Keckeis <martin.keckeis1@gmail.com>2015-04-07 09:53:31 +0300
committerMartin Keckeis <martin.keckeis1@gmail.com>2015-04-07 09:53:31 +0300
commitd4fe534bbc407b9e2340d9bce924a933c457a0b9 (patch)
treefa6de1f825b6701b214b35158f1c9abe2d85bac9 /core/Config.php
parent452d91fa3a0f297fb506c579b5bca98ccd331547 (diff)
Update Config.php
Diffstat (limited to 'core/Config.php')
-rw-r--r--core/Config.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/Config.php b/core/Config.php
index 91853de733..9e43745f08 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -434,6 +434,11 @@ class Config extends Singleton
{
return $this->settings->getFrom($this->pathCommon, $name);
}
+
+ public function getFromLocalConfig($name)
+ {
+ return $this->settings->getFrom($this->pathLocal, $name);
+ }
/**
* Sets a configuration value or section.
@@ -524,4 +529,4 @@ class Config extends Singleton
$path = "config/" . basename($this->pathLocal);
return new Exception(Piwik::translate('General_ConfigFileIsNotWritable', array("(" . $path . ")", "")));
}
-} \ No newline at end of file
+}