aboutsummaryrefslogtreecommitdiff
path: root/lib/Minz/Configuration.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-06 21:16:33 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-06 21:16:33 +0100
commit17a280230f1e47d092d8e22bc5d1041e7a84979f (patch)
tree7cb6233cabbcee0de8fd73cc8e1966b61e825f21 /lib/Minz/Configuration.php
parentaddcea9cd45a87f2ae56f879bad86425efc16fba (diff)
Change Minz_Configuration::parseFile() in load()
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'lib/Minz/Configuration.php')
-rw-r--r--lib/Minz/Configuration.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 66df21a31..039ba9645 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -39,7 +39,7 @@ class Minz_Configuration {
* @return an array of values
* @throws Minz_FileNotExistException if the file does not exist.
*/
- public static function parseFile($filename) {
+ public static function load($filename) {
if (!file_exists($filename)) {
throw new Minz_FileNotExistException($filename);
}
@@ -106,7 +106,7 @@ class Minz_Configuration {
$this->config_filename = $config_filename;
try {
- $this->data = self::parseFile($this->config_filename);
+ $this->data = self::load($this->config_filename);
} catch (Minz_FileNotExistException $e) {
if (is_null($default_filename)) {
throw $e;
@@ -115,7 +115,7 @@ class Minz_Configuration {
$this->default_filename = $default_filename;
if (!is_null($this->default_filename)) {
- $this->data_default = self::parseFile($this->default_filename);
+ $this->data_default = self::load($this->default_filename);
}
}