From 051f1649f705dd77febd39c8f4a53c97f4c1115f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 21 Jun 2020 10:30:12 +0200 Subject: FeedMe table manage feeds + fix warning addFeed (#3075) FeedMe is able to add/remove subscriptions. Fix minor bug introduced by https://github.com/FreshRSS/FreshRSS/pull/1731 If the category ID is provided, we must first search for the existing category before trying to add a category with the provided name. Fix: ``` SQL error addCategory: ["23000",19,"UNIQUE constraint failed: category.name"] ``` --- app/Controllers/feedController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/Controllers/feedController.php') diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index fda6ddfcd..c0843ffba 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -54,11 +54,12 @@ class FreshRSS_feed_Controller extends Minz_ActionController { } $cat = null; - if ($new_cat_name != '') { + if ($cat_id > 0) { + $cat = $catDAO->searchById($cat_id); + } + if ($cat == null && $new_cat_name != '') { $new_cat_id = $catDAO->addCategory(array('name' => $new_cat_name)); $cat_id = $new_cat_id > 0 ? $new_cat_id : $cat_id; - } - if ($cat_id > 0) { $cat = $catDAO->searchById($cat_id); } if ($cat == null) { -- cgit v1.2.3