Преглед изворни кода

Fix export with MySQL (#5988)

fix https://github.com/FreshRSS/FreshRSS/issues/5982
Alexandre Alapetite пре 2 година
родитељ
комит
65c6c2d5cb
1 измењених фајлова са 5 додато и 4 уклоњено
  1. 5 4
      app/Services/ExportService.php

+ 5 - 4
app/Services/ExportService.php

@@ -90,14 +90,15 @@ class FreshRSS_Export_Service {
 	 *                    It also can return null if the feed doesn’t exist.
 	 */
 	public function generateFeedEntries(int $feed_id, int $max_number_entries): ?array {
-		$feed = $this->feed_dao->searchById($feed_id);
+		$view = new FreshRSS_View();
+		$view->categories = $this->category_dao->listCategories(true) ?: [];
+
+		$feed = FreshRSS_CategoryDAO::findFeed($view->categories, $feed_id);
 		if ($feed === null) {
 			return null;
 		}
-
-		$view = new FreshRSS_View();
-		$view->categories = $this->category_dao->listCategories(true) ?: [];
 		$view->feed = $feed;
+
 		$day = date('Y-m-d');
 		$filename = "feed_{$day}_" . $feed->categoryId() . '_' . $feed->id() . '.json';