diff options
| author | Marien Fressinaud <dev@marienfressinaud.fr> | 2015-01-05 22:43:15 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr> | 2015-01-05 22:45:03 +0100 |
| commit | 7cca47d1ab5838f5440b1a1e08fa4c0d43989664 (patch) | |
| tree | b51ae930a11afd4c9622c27c1926310f980d294e /app/Controllers/javascriptController.php | |
| parent | 51a71ec4b9d62528054be8faee1576a8fd6d37f6 (diff) | |
| download | freshrss-7cca47d1ab5838f5440b1a1e08fa4c0d43989664.tar.gz freshrss-7cca47d1ab5838f5440b1a1e08fa4c0d43989664.zip | |
Change name of user configuration var in Context
- FreshRSS_Context::$conf is replaced by FreshRSS_Context::$user_conf
- Introduce FreshRSS_Context::$system_conf
- Remove FreshRSS_Configuration object
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/Controllers/javascriptController.php')
| -rwxr-xr-x | app/Controllers/javascriptController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php index 113f58ea9..b178801d4 100755 --- a/app/Controllers/javascriptController.php +++ b/app/Controllers/javascriptController.php @@ -8,7 +8,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController { public function actualizeAction() { header('Content-Type: text/javascript; charset=UTF-8'); $feedDAO = FreshRSS_Factory::createFeedDao(); - $this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$conf->ttl_default); + $this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_conf->ttl_default); } public function nbUnreadsPerFeedAction() { |