Bläddra i källkod

Fix add feed with MariaDB / MySQL (#6900)

* Fix add feed with MariaDB / MySQL
fix https://github.com/FreshRSS/FreshRSS/issues/6897
Regression from https://github.com/FreshRSS/FreshRSS/pull/4487

* Type fix
Alexandre Alapetite 1 år sedan
förälder
incheckning
f77b45656d
2 ändrade filer med 5 tillägg och 5 borttagningar
  1. 2 2
      app/Controllers/feedController.php
  2. 3 3
      app/Models/FeedDAO.php

+ 2 - 2
app/Controllers/feedController.php

@@ -926,7 +926,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
 		}
 		}
 		FreshRSS_UserDAO::touch();
 		FreshRSS_UserDAO::touch();
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		return $feedDAO->updateFeed($feed_id, ['name' => $feed_name]) === 1;
+		return $feedDAO->updateFeed($feed_id, ['name' => $feed_name]);
 	}
 	}
 
 
 	public static function moveFeed(int $feed_id, int $cat_id, string $new_cat_name = ''): bool {
 	public static function moveFeed(int $feed_id, int $cat_id, string $new_cat_name = ''): bool {
@@ -949,7 +949,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
 		}
 		}
 
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		return $feedDAO->updateFeed($feed_id, ['category' => $cat_id]) === 1;
+		return $feedDAO->updateFeed($feed_id, ['category' => $cat_id]);
 	}
 	}
 
 
 	/**
 	/**

+ 3 - 3
app/Models/FeedDAO.php

@@ -140,7 +140,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 	 * @param array{'url'?:string,'kind'?:int,'category'?:int,'name'?:string,'website'?:string,'description'?:string,'lastUpdate'?:int,'priority'?:int,
 	 * @param array{'url'?:string,'kind'?:int,'category'?:int,'name'?:string,'website'?:string,'description'?:string,'lastUpdate'?:int,'priority'?:int,
 	 * 	'pathEntries'?:string,'httpAuth'?:string,'error'?:int,'ttl'?:int,'attributes'?:string|array<string,mixed>} $valuesTmp $valuesTmp
 	 * 	'pathEntries'?:string,'httpAuth'?:string,'error'?:int,'ttl'?:int,'attributes'?:string|array<string,mixed>} $valuesTmp $valuesTmp
 	 */
 	 */
-	public function updateFeed(int $id, array $valuesTmp): int|false {
+	public function updateFeed(int $id, array $valuesTmp): bool {
 		$values = [];
 		$values = [];
 		$originalValues = $valuesTmp;
 		$originalValues = $valuesTmp;
 		if (isset($valuesTmp['name'])) {
 		if (isset($valuesTmp['name'])) {
@@ -174,7 +174,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 		$values[] = $id;
 		$values[] = $id;
 
 
 		if ($stm !== false && $stm->execute($values)) {
 		if ($stm !== false && $stm->execute($values)) {
-			return $stm->rowCount();
+			return true;
 		} else {
 		} else {
 			$info = $stm === false ? $this->pdo->errorInfo() : $stm->errorInfo();
 			$info = $stm === false ? $this->pdo->errorInfo() : $stm->errorInfo();
 			if ($this->autoUpdateDb($info)) {
 			if ($this->autoUpdateDb($info)) {
@@ -189,7 +189,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 	 * @param non-empty-string $key
 	 * @param non-empty-string $key
 	 * @param string|array<mixed>|bool|int|null $value
 	 * @param string|array<mixed>|bool|int|null $value
 	 */
 	 */
-	public function updateFeedAttribute(FreshRSS_Feed $feed, string $key, $value): int|false {
+	public function updateFeedAttribute(FreshRSS_Feed $feed, string $key, $value): bool {
 		$feed->_attribute($key, $value);
 		$feed->_attribute($key, $value);
 		return $this->updateFeed(
 		return $this->updateFeed(
 			$feed->id(),
 			$feed->id(),