Merge remote-tracking branch 'upstream/edge' into edge

math-GH · May 10, 2024 · 68a6491 · 68a6491
2 parents 99916e7 + fa731db
commit 68a6491
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
@@ -202,7 +202,7 @@ public function opmlAction(): void {
 		$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
@@ -389,7 +389,8 @@ public static function _get(string $get): void {
 
 		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) {

diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php
@@ -284,7 +284,7 @@ private function createFeed(array $feed_elt, FreshRSS_Category $category, bool $
 				$curl_params[CURLOPT_PROXY] = $feed_elt['frss:CURLOPT_PROXY'];
 			}
 			if (isset($feed_elt['frss:CURLOPT_PROXYTYPE'])) {
-				$curl_params[CURLOPT_PROXYTYPE] = $feed_elt['frss:CURLOPT_PROXYTYPE'];
+				$curl_params[CURLOPT_PROXYTYPE] = (int)$feed_elt['frss:CURLOPT_PROXYTYPE'];
 			}
 			if (isset($feed_elt['frss:CURLOPT_USERAGENT'])) {
 				$curl_params[CURLOPT_USERAGENT] = $feed_elt['frss:CURLOPT_USERAGENT'];