diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-08 10:27:01 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-08 10:27:01 +0100 |
| commit | 46e98bad9119c3ee7088b65ebb6b4d1331419602 (patch) | |
| tree | 6f0e081597ba9ced0c0faca9b5e4c04394605aaf /app/Controllers/entryController.php | |
| parent | 7584364a4c2b407e97909e94ba274da62620abea (diff) | |
| parent | 9265cd57333b2a91effc6ea284b504fbc977b9ed (diff) | |
Merge branch '730-improve_configuration' into dev
BREAKING FEATURE: please follow instructions from
https://github.com/FreshRSS/FreshRSS/issues/730 to
update your configuration file.
Fix https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/Controllers/entryController.php')
| -rwxr-xr-x | app/Controllers/entryController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php index aae08c413..1d9989f40 100755 --- a/app/Controllers/entryController.php +++ b/app/Controllers/entryController.php @@ -154,7 +154,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController { public function purgeAction() { @set_time_limit(300); - $nb_month_old = max(FreshRSS_Context::$conf->old_entries, 1); + $nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1); $date_min = time() - (3600 * 24 * 30 * $nb_month_old); $feedDAO = FreshRSS_Factory::createFeedDao(); @@ -168,7 +168,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController { if ($feed_history == -2) { // TODO: -2 must be a constant! // -2 means we take the default value from configuration - $feed_history = FreshRSS_Context::$conf->keep_history_default; + $feed_history = FreshRSS_Context::$user_conf->keep_history_default; } if ($feed_history >= 0) { |