Fix category not change (updating feed on MySQL)

See https://github.com/marienfressinaud/FreshRSS/issues/646

1 files changed, 4 insertions, 2 deletions

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index eb26d9786..d694c103e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -384,12 +384,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$cat_id = Minz_Request::param('c_id');
 
 			$feedDAO = FreshRSS_Factory::createFeedDao();
-
 			$values = array(
 				'category' => $cat_id,
 			);
 
-			if (!$feedDAO->updateFeed($feed_id, $values)) {
+			$feed = $feedDAO->searchById($feed_id);
+
+			if (!$feed || ($feed->category() != $cat_id &&
+			               !$feedDAO->updateFeed($feed_id, $values))) {
 				Minz_Error::error(
 					404,
 					array('error' => array(_t('error_occurred')))