mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-21 14:57:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FreshRSS/dev' into dev

Browse Source
This commit is contained in:
Alexandre Alapetite
2015-07-28 15:24:07 +02:00
parent 2f2facac30 ee093c611c
commit 0c0da697da
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/ConfigurationSetter.php
View File

@@ -362,6 +362,7 @@ class FreshRSS_ConfigurationSetter {
continue;
}
$value = intval($value);
$limits = $limits_keys[$key];
if (
(!isset($limits['min']) || $value >= $limits['min']) &&

26
lib/Minz/Configuration.php
View File

@@ -84,11 +84,6 @@ class Minz_Configuration {
*/
private $data = array();
/**
* The default values, an empty array by default.
*/
private $data_default = array();
/**
* An object which help to set good values in configuration.
*/
@@ -119,21 +114,22 @@ class Minz_Configuration {
$configuration_setter = null) {
$this->namespace = $namespace;
$this->config_filename = $config_filename;
$this->default_filename = $default_filename;
$this->_configurationSetter($configuration_setter);
if (!is_null($this->default_filename)) {
$this->data = self::load($this->default_filename);
}
try {
$this->data = self::load($this->config_filename);
$this->data = array_replace_recursive(
$this->data, self::load($this->config_filename)
);
} catch (Minz_FileNotExistException $e) {
if (is_null($default_filename)) {
if (is_null($this->default_filename)) {
throw $e;
}
}
$this->default_filename = $default_filename;
if (!is_null($this->default_filename)) {
$this->data_default = self::load($this->default_filename);
}
$this->_configurationSetter($configuration_setter);
}
/**
@@ -160,8 +156,6 @@ class Minz_Configuration {
return $this->data[$key];
} elseif (!is_null($default)) {
return $default;
} elseif (isset($this->data_default[$key])) {
return $this->data_default[$key];
} else {
Minz_Log::warning($key . ' does not exist in configuration');
return null;