From 4e4108aaf80e2e49b4ca217b56065c49cf7347f4 Mon Sep 17 00:00:00 2001
From: Sean Molenaar <sean@seanmolenaar.eu>
Date: Sat, 20 Feb 2021 14:02:35 +0100
Subject: Feed: Fix rename moving file

Issue #1181

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
---
 lib/Controller/FeedController.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/Controller/FeedController.php b/lib/Controller/FeedController.php
index c80a5c327..fd041ea08 100644
--- a/lib/Controller/FeedController.php
+++ b/lib/Controller/FeedController.php
@@ -335,7 +335,7 @@ class FeedController extends Controller
         ?bool $fullTextEnabled = null,
         ?int $updateMode = null,
         ?int $ordering = null,
-        ?int $folderId = null,
+        ?int $folderId = -1,
         ?string $title = null
     ) {
         try {
@@ -344,8 +344,10 @@ class FeedController extends Controller
             return $this->error($ex, Http::STATUS_NOT_FOUND);
         }
 
-        $fId = $folderId === 0 ? null : $folderId;
-        $feed->setFolderId($fId);
+        if ($folderId !== -1) {
+            $fId = $folderId === 0 ? null : $folderId;
+            $feed->setFolderId($fId);
+        }
         if ($pinned !== null) {
             $feed->setPinned($pinned);
         }
-- 
cgit v1.2.3