From 228d7adfdb90c3fdd179f80fbfde565eb06e0cec Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 15 Jun 2023 12:47:47 +0200 Subject: Fix slider views (#5469) * Fix slider titles And fix full-page view of category configuration. FIx https://github.com/FreshRSS/FreshRSS/pull/5449#issuecomment-1590021947 * Fix user queries and user management Implement https://github.com/FreshRSS/FreshRSS/pull/5469#issuecomment-1591957935 --- app/Controllers/subscriptionController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/Controllers/subscriptionController.php') diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index d96cb02e1..3383dc66a 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -107,7 +107,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { $feed = $this->view->feeds[$id]; $this->view->feed = $feed; - FreshRSS_View::prependTitle(_t('sub.title.feed_management') . ' · ' . $feed->name() . ' · '); + FreshRSS_View::prependTitle($feed->name() . ' · ' . _t('sub.title.feed_management') . ' · '); if (Minz_Request::isPost()) { $user = Minz_Request::paramString('http_user_feed' . $id); @@ -283,7 +283,9 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { } public function categoryAction(): void { - $this->view->_layout(null); + if (Minz_Request::paramBoolean('ajax')) { + $this->view->_layout(null); + } $categoryDAO = FreshRSS_Factory::createCategoryDao(); @@ -295,6 +297,8 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { } $this->view->category = $category; + FreshRSS_View::prependTitle($category->name() . ' · ' . _t('sub.title') . ' · '); + if (Minz_Request::isPost()) { if (Minz_Request::paramBoolean('use_default_purge_options')) { $category->_attributes('archiving', null); -- cgit v1.2.3