summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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);
}
}