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:
authordiosmosis <benaka@piwik.pro>2015-04-07 05:54:37 +0300
committerdiosmosis <benaka@piwik.pro>2015-04-07 05:54:37 +0300
commit0dc0ba95ea52a5fac46dadfbda70709802a2703c (patch)
tree18871189ba804be8a7d0af49204b1ecb45f16e5d /core/Config.php
parentf232c1a04054027bb9cab39d6359cccdbdff3db6 (diff)
Make Config::reload a protected member so Config is generally setup once and not reloaded w/ different files later.
Diffstat (limited to 'core/Config.php')
-rw-r--r--core/Config.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/Config.php b/core/Config.php
index 905b8a378d..5a9b7852f7 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -309,7 +309,6 @@ class Config extends Singleton
/**
* Clear in-memory configuration so it can be reloaded
* @deprecated since v2.12.0
- * TODO: remove uses of.
*/
public function clear()
{
@@ -322,7 +321,6 @@ class Config extends Singleton
*
* @throws Exception if local config file is not readable; exits for other errors
* @deprecated since v2.12.0
- * TODO: remove uses of
*/
public function init()
{
@@ -334,9 +332,8 @@ class Config extends Singleton
*
* @throws \Exception if the global config file is not found and this is a tracker request, or
* if the local config file is not found and this is NOT a tracker request.
- * TODO: make private
*/
- public function reload()
+ protected function reload()
{
$this->initialized = false;