aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2024-05-07 23:04:17 +0200
committerGravatar GitHub <noreply@github.com> 2024-05-07 23:04:17 +0200
commitea2bcf3a5d879286350c6ad60872f94f46c6fffb (patch)
tree9924a299119913d437ef6b38faf26029bdada565
parentfd7157e40ca32fb1bcda51f1aaf484cbb7988bdd (diff)
Fix individual OMPL feed export (#6435)
fix https://github.com/FreshRSS/FreshRSS/issues/6433
-rw-r--r--app/Controllers/indexController.php2
-rw-r--r--app/Models/Context.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 65e30c4bd..2588320b5 100644
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -202,7 +202,7 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {
$type = (string)$get[0];
$id = (int)$get[1];
- $this->view->excludeMutedFeeds = true;
+ $this->view->excludeMutedFeeds = $type !== 'f'; // Exclude muted feeds except when we focus on a feed
switch ($type) {
case 'a':
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 37a2064c6..7efb24ab1 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -389,7 +389,8 @@ final class FreshRSS_Context {
if (empty(self::$categories)) {
$catDAO = FreshRSS_Factory::createCategoryDao();
- self::$categories = $catDAO->listCategories(true);
+ $details = $type === 'f'; // Load additional feed details in the case of feed view
+ self::$categories = $catDAO->listCategories(true, $details);
}
switch($type) {