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/layout/nav_menu.phtml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/layout/nav_menu.phtml')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 090b55785..bb9468ab1 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -98,13 +98,13 @@
 					<a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
 				</li>
 
-				<?php foreach ($this->conf->queries as $query) { ?>
+				<?php foreach (FreshRSS_Context::$conf->queries as $query) { ?>
 				<li class="item query">
 					<a href="<?php echo $query['url']; ?>"><?php echo $query['name']; ?></a>
 				</li>
 				<?php } ?>
 
-				<?php if (count($this->conf->queries) > 0) { ?>
+				<?php if (count(FreshRSS_Context::$conf->queries) > 0) { ?>
 				<li class="separator no-mobile"></li>
 				<?php } ?>
 
@@ -132,7 +132,7 @@
 			$string_mark = _t('mark_cat_read');
 		}
 		$nextGet = $get;
-		if ($this->conf->onread_jump_next && strlen($get) > 2) {
+		if (FreshRSS_Context::$conf->onread_jump_next && strlen($get) > 2) {
 			$anotherUnreadId = '';
 			$foundCurrent = false;
 			switch ($get[0]) {
@@ -180,7 +180,7 @@
 
 		$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('get' => $get, 'nextGet' => $nextGet, 'idMax' => $idMax));
 		$output = Minz_Request::param('output', '');
-		if ($output != '' && $this->conf->view_mode !== $output) {
+		if ($output != '' && FreshRSS_Context::$conf->view_mode !== $output) {
 			$arUrl['params']['output'] = $output;
 		}
 		$markReadUrl = Minz_Url::display($arUrl);
@@ -190,7 +190,7 @@
 	<form id="mark-read-menu" method="post" style="display: none"></form>
 
 	<div class="stick" id="nav_menu_read_all">
-		<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
+		<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
 		        formaction="<?php echo $markReadUrl; ?>"
@@ -252,8 +252,8 @@
 
 		<?php
 			$url_output['params']['output'] = 'rss';
-			if ($this->conf->token) {
-				$url_output['params']['token'] = $this->conf->token;
+			if (FreshRSS_Context::$conf->token) {
+				$url_output['params']['token'] = FreshRSS_Context::$conf->token;
 			}
 		?>
 		<a class="view_rss btn" target="_blank" title="<?php echo _t('rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
-- 
cgit v1.2.3