summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranoy <anoymouserver@users.noreply.github.com>2020-12-23 16:59:54 +0100
committeranoy <anoymouserver@users.noreply.github.com>2020-12-23 17:32:26 +0100
commitd1c50b8e77e180db50b94cfdbc5c8b01495636ba (patch)
treeac74be607f8a3a5ef42bf8dd643db5467d9e0634
parentd542cf5376ca5869d19aa45849428354596d74d2 (diff)
fix FeedMapper find exception
Exception: Argument 2 passed to OCA\News\Db\FeedMapper::find() must be of the type int, string given Signed-off-by: anoy <anoymouserver+github@mailbox.org>
-rw-r--r--CHANGELOG.md3
-rw-r--r--lib/Db/FeedMapper.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bcd99f01..c7cc2cb8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
## Unreleased
+### Fixed
+- Argument 2 passed to OCA\News\Db\FeedMapper::find() must be of the type int, string given #996
+
## 15.1.1-rc2
### Changed
diff --git a/lib/Db/FeedMapper.php b/lib/Db/FeedMapper.php
index 193cf1f5d..cf12c4dfa 100644
--- a/lib/Db/FeedMapper.php
+++ b/lib/Db/FeedMapper.php
@@ -197,6 +197,6 @@ class FeedMapper extends NewsMapper
public function findFromUser(string $userId, int $id): Entity
{
- return $this->find($id, $userId);
+ return $this->find($userId, $id);
}
}