aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/feedController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre.alapetite@alexandra.dk> 2016-09-26 15:20:02 +0200
committerGravatar Alexandre Alapetite <alexandre.alapetite@alexandra.dk> 2016-09-26 15:20:02 +0200
commitd5ca360ca967d327a184429a2e37aed196add7a0 (patch)
tree7c658a7ae04e32854703030b4ddcd77f90becdfb /app/Controllers/feedController.php
parent273d28b763d4eaf32a250e8c002e3775eb2513e9 (diff)
API fix feed rename
https://github.com/FreshRSS/FreshRSS/issues/1254 https://github.com/jangernert/FeedReader/issues/59#issuecomment-249558202
Diffstat (limited to 'app/Controllers/feedController.php')
-rwxr-xr-xapp/Controllers/feedController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index ca7a818c6..c2a22aeb3 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -474,7 +474,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
}
public static function moveFeed($feed_id, $cat_id, $new_cat_name = '') {
- if ($feed_id <= 0) {
+ if ($feed_id <= 0 || ($cat_id <= 0 && $new_cat_name == '')) {
return false;
}