From 1a22a87fb1b1fcb61d201de399c33c2185dc1f6e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 20 Oct 2014 18:45:22 +0200
Subject: Use FreshRSS_Context::$conf only

- Replace $this->view->conf in controllers
- Replace $this->conf in views
---
 app/Controllers/javascriptController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Controllers/javascriptController.php')

diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 14e6f36de..62f413989 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($this->view->conf->ttl_default);
+		$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$conf->ttl_default);
 	}
 
 	public function nbUnreadsPerFeedAction() {
-- 
cgit v1.2.3