mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-05 07:03:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix add feed with MariaDB / MySQL (#6900)

Browse Source 
* 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
This commit is contained in:
Alexandre Alapetite
2024-10-15 17:14:50 +02:00
committed by GitHub
parent b552d9f4bc
commit f77b45656d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/feedController.php
View File

@@ -926,7 +926,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
}
FreshRSS_UserDAO::touch();
$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 {
@@ -949,7 +949,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
}
$feedDAO = FreshRSS_Factory::createFeedDao();
return $feedDAO->updateFeed($feed_id, ['category' => $cat_id]) === 1;
return $feedDAO->updateFeed($feed_id, ['category' => $cat_id]);
}
/**

6
app/Models/FeedDAO.php
View File

@@ -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,
* '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 = [];
$originalValues = $valuesTmp;
if (isset($valuesTmp['name'])) {
@@ -174,7 +174,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
$values[] = $id;
if ($stm !== false && $stm->execute($values)) {
return $stm->rowCount();
return true;
} else {
$info = $stm === false ? $this->pdo->errorInfo() : $stm->errorInfo();
if ($this->autoUpdateDb($info)) {
@@ -189,7 +189,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
* @param non-empty-string $key
* @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);
return $this->updateFeed(
$feed->id(),