Преглед на файлове

Fix individual OMPL feed export (#6435)

fix https://github.com/FreshRSS/FreshRSS/issues/6433
Alexandre Alapetite преди 1 година
родител
ревизия
ea2bcf3a5d
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 1 1
      app/Controllers/indexController.php
  2. 2 1
      app/Models/Context.php

+ 1 - 1
app/Controllers/indexController.php

@@ -202,7 +202,7 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {
 		$type = (string)$get[0];
 		$type = (string)$get[0];
 		$id = (int)$get[1];
 		$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) {
 		switch ($type) {
 			case 'a':
 			case 'a':

+ 2 - 1
app/Models/Context.php

@@ -389,7 +389,8 @@ final class FreshRSS_Context {
 
 
 		if (empty(self::$categories)) {
 		if (empty(self::$categories)) {
 			$catDAO = FreshRSS_Factory::createCategoryDao();
 			$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) {
 		switch($type) {