diff options
| -rw-r--r-- | app/App_FrontController.php | 10 | ||||
| -rwxr-xr-x | app/controllers/indexController.php | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/app/App_FrontController.php b/app/App_FrontController.php index 902ae4613..483bae567 100644 --- a/app/App_FrontController.php +++ b/app/App_FrontController.php @@ -47,6 +47,12 @@ class App_FrontController extends FrontController { View::_param ('nb_not_read', $entryDAO->countNotRead ()); Session::_param ('language', $this->conf->language ()); + + $output = Request::param ('output'); + if(!$output) { + $output = $this->conf->viewMode(); + Request::_param ('output', $output); + } } private function loadStylesAndScripts () { @@ -57,11 +63,13 @@ class App_FrontController extends FrontController { } } View::appendStyle (Url::display ('/themes/printer/style.css?' . @filemtime(PUBLIC_PATH . '/themes/printer/style.css')), 'print'); + if (login_is_conf ($this->conf)) { View::appendScript ('https://login.persona.org/include.js'); } View::appendScript (Url::display ('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js'))); - if ($this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader')) { + if ($this->conf->lazyload () === 'yes' && + ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader')) { View::appendScript (Url::display ('/scripts/jquery.lazyload.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.lazyload.min.js'))); } View::appendScript (Url::display ('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js'))); diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php index 2f86034ee..140bbfc72 100755 --- a/app/controllers/indexController.php +++ b/app/controllers/indexController.php @@ -44,11 +44,6 @@ class indexController extends ActionController { $this->view->_useLayout (false); header('Content-Type: application/rss+xml; charset=utf-8'); } else { - if(!$output) { - $output = $this->view->conf->viewMode(); - Request::_param ('output', $output); - } - View::appendScript (Url::display ('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js'))); if ($output == 'global') { |