From 1a22a87fb1b1fcb61d201de399c33c2185dc1f6e Mon Sep 17 00:00:00 2001 From: Marien Fressinaud 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/views/helpers/javascript_vars.phtml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'app/views/helpers/javascript_vars.phtml') diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index 3bbcc3848..8e9141d4e 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -1,12 +1,12 @@ "use strict"; conf->mark_when; +$mark = FreshRSS_Context::$conf->mark_when; $mail = Minz_Session::param('mail', false); $auto_actualize = Minz_Session::param('actualize_feeds', false); -$hide_posts = ($this->conf->display_posts || +$hide_posts = (FreshRSS_Context::$conf->display_posts || Minz_Request::param('output') === 'reader'); -$s = $this->conf->shortcuts; +$s = FreshRSS_Context::$conf->shortcuts; $url_login = Minz_Url::display(array( 'c' => 'auth', @@ -19,15 +19,15 @@ $url_logout = Minz_Url::display(array( echo 'var context={', 'hide_posts:', $hide_posts ? 'false' : 'true', ',', - 'display_order:"', Minz_Request::param('order', $this->conf->sort_order), '",', + 'display_order:"', Minz_Request::param('order', FreshRSS_Context::$conf->sort_order), '",', 'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',', 'auto_mark_site:', $mark['site'] ? 'true' : 'false', ',', 'auto_mark_scroll:', $mark['scroll'] ? 'true' : 'false', ',', - 'auto_load_more:', $this->conf->auto_load_more ? 'true' : 'false', ',', + 'auto_load_more:', FreshRSS_Context::$conf->auto_load_more ? 'true' : 'false', ',', 'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',', - 'does_lazyload:', $this->conf->lazyload ? 'true' : 'false', ',', - 'sticky_post:', $this->conf->sticky_post ? 'true' : 'false', ',', - 'html5_notif_timeout:', $this->conf->html5_notif_timeout, ',', + 'does_lazyload:', FreshRSS_Context::$conf->lazyload ? 'true' : 'false', ',', + 'sticky_post:', FreshRSS_Context::$conf->sticky_post ? 'true' : 'false', ',', + 'html5_notif_timeout:', FreshRSS_Context::$conf->html5_notif_timeout, ',', 'auth_type:"', Minz_Configuration::authType(), '",', 'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',', 'current_view:"', Minz_Request::param('output', 'normal'), '"', -- cgit v1.2.3