summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Brahmer <info@b-brahmer.de>2022-08-19 11:57:38 +0200
committerBenjamin Brahmer <info@b-brahmer.de>2022-08-25 07:50:36 +0200
commitc2174483455a225bd84cbaf546db827d0d8a9fea (patch)
tree6db23af26d05d376167f3fed47c565a580806a7f
parente60fdff33e52724254f28d82075a79be51a5656b (diff)
Fix adding feed that was just deleted is causing an error
Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
-rw-r--r--CHANGELOG.md1
-rw-r--r--lib/Controller/FeedController.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13381396a..4fe7e20c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1
- Document api item types (#1861)
- Fix deprecation warnings from Nextcloud server (#1869)
- Fix when marking all items as read, all items of the user are used in the sql query (#1873)
+- Fix adding feed via the web-ui that was just deleted causing an error (#1872)
# Releases
## [18.1.1] - 2022-08-12
diff --git a/lib/Controller/FeedController.php b/lib/Controller/FeedController.php
index f071ade0f..74e8b2abe 100644
--- a/lib/Controller/FeedController.php
+++ b/lib/Controller/FeedController.php
@@ -170,7 +170,7 @@ class FeedController extends Controller
try {
// we need to purge deleted feeds if a feed is created to
// prevent already exists exceptions
- $this->feedService->purgeDeleted($this->getUserId(), false);
+ $this->feedService->purgeDeleted($this->getUserId(), null);
$feed = $this->feedService->create(
$this->getUserId(),