diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-09-26 15:24:23 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-09-26 15:24:23 +0200 |
| commit | 1d87ebe9dd607a8e4da395d102763b62a94ac02b (patch) | |
| tree | 7c658a7ae04e32854703030b4ddcd77f90becdfb /app/Controllers/feedController.php | |
| parent | 273d28b763d4eaf32a250e8c002e3775eb2513e9 (diff) | |
| parent | d5ca360ca967d327a184429a2e37aed196add7a0 (diff) | |
Merge pull request #1268 from Alkarex/apix-fix-feed-rename
API fix feed rename
Diffstat (limited to 'app/Controllers/feedController.php')
| -rwxr-xr-x | app/Controllers/feedController.php | 2 |
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; } |