diff options
Diffstat (limited to 'lib/Minz')
| -rw-r--r-- | lib/Minz/Configuration.php | 4 | ||||
| -rw-r--r-- | lib/Minz/FrontController.php | 3 | ||||
| -rw-r--r-- | lib/Minz/Log.php | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php index 93f6b494c..3cf356a2b 100644 --- a/lib/Minz/Configuration.php +++ b/lib/Minz/Configuration.php @@ -136,6 +136,10 @@ class Minz_Configuration { } } + public function configurationSetter() { + return $this->configuration_setter; + } + /** * Return the value of the given param. * diff --git a/lib/Minz/FrontController.php b/lib/Minz/FrontController.php index e09b022fc..1f67884fa 100644 --- a/lib/Minz/FrontController.php +++ b/lib/Minz/FrontController.php @@ -31,9 +31,6 @@ class Minz_FrontController { */ public function __construct () { try { - Minz_Configuration::register('system', - DATA_PATH . '/config.php', - FRESHRSS_PATH . '/config.default.php'); $this->setReporting(); Minz_Request::init(); diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php index f67d16619..f8d024c1f 100644 --- a/lib/Minz/Log.php +++ b/lib/Minz/Log.php @@ -37,8 +37,10 @@ class Minz_Log { if ($username == '') { $username = '_'; } - if ($file_name === null) { + if ($file_name == null) { $file_name = join_path(USERS_PATH, $username, 'log.txt'); + } else { + $username = '_'; } switch ($level) { |