diff --git a/app/FreshRSS.php b/app/FreshRSS.php index 40e1d23db..c51f91dec 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -106,8 +106,8 @@ class FreshRSS extends Minz_FrontController { private function loadParamsView () { Minz_Session::_param ('language', $this->conf->language); Minz_Translate::init(); - $output = Minz_Request::param ('output'); - if (!$output) { + $output = Minz_Request::param ('output', ''); + if (($output === '') || ($output !== 'normal' && $output !== 'rss' && $output !== 'reader' && $output !== 'global')) { $output = $this->conf->view_mode; Minz_Request::_param ('output', $output); } diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index e67d8a791..d6a1737ee 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -28,7 +28,7 @@ - + partial ('header'); ?>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index b9ce33295..edd7707ad 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -1,5 +1,10 @@ +