summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranoy <anoymouserver+github@mailbox.org>2021-01-14 10:19:06 +0100
committeranoy <anoymouserver@users.noreply.github.com>2021-01-15 15:16:41 +0100
commitfdf4fa454d5f485f193130b24a79ea836c3f0278 (patch)
treea075b8f16c34153f14301f9097ec7b7948fc4a02
parentdb5e0bd5d0da32b9bd3c5e7a7537cac42febaa07 (diff)
fix TypeError in ItemMapper
Signed-off-by: anoy <anoymouserver+github@mailbox.org>
-rw-r--r--CHANGELOG.md1
-rw-r--r--lib/Db/ItemMapper.php4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c498bfffa..101e76299 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
### Fixed
- opened state of folders is not restored (#1040)
+- Argument 3 passed to OCA\News\Db\ItemMapper::makeSelectQuery() must be of the type bool, array given (#1044)
## [15.2.0-beta1] - 2021-01-11
diff --git a/lib/Db/ItemMapper.php b/lib/Db/ItemMapper.php
index 9b0c04d1d..2b07a570f 100644
--- a/lib/Db/ItemMapper.php
+++ b/lib/Db/ItemMapper.php
@@ -281,7 +281,7 @@ class ItemMapper extends Mapper
$this->getOperator($oldestFirst) . ' ? ';
$params[] = $offset;
}
- $sql = $this->makeSelectQuery($sql, $oldestFirst, $search);
+ $sql = $this->makeSelectQuery($sql, $oldestFirst);
return $this->findEntitiesIgnoringNegativeLimit($sql, $params, $limit);
}
@@ -308,7 +308,7 @@ class ItemMapper extends Mapper
$sql .= 'AND `items`.`id` ' . $this->getOperator($oldestFirst) . ' ? ';
$params[] = $offset;
}
- $sql = $this->makeSelectQuery($sql, $oldestFirst, $search);
+ $sql = $this->makeSelectQuery($sql, $oldestFirst);
return $this->findEntitiesIgnoringNegativeLimit($sql, $params, $limit);
}