Merge pull request #9345 from annando/issue-9344

[friendica.git] / src / BaseRepository.php

diff --git a/src/BaseRepository.php b/src/BaseRepository.php
index 64a0d1c510626e995cb4c213f9565271fa6af062..abec4c119b3f21c834cc73ba34017184ded8f94f 100644 (file)
--- a/src/BaseRepository.php
+++ b/src/BaseRepository.php
@@ -109,26 +109,22 @@ abstract class BaseRepository extends BaseFactory
         */
        public function selectByBoundaries(array $condition = [], array $params = [], int $max_id = null, int $since_id = null, int $limit = self::LIMIT)
        {
-               $condition = DBA::collapseCondition($condition);
+               $totalCount = DBA::count(static::$table_name, $condition);
 
                $boundCondition = $condition;
 
                if (isset($max_id)) {
-                       $boundCondition[0] .= " AND `id` < ?";
-                       $boundCondition[] = $max_id;
+                       $boundCondition = DBA::mergeConditions($boundCondition, ['`id` < ?', $max_id]);
                }
 
                if (isset($since_id)) {
-                       $boundCondition[0] .= " AND `id` > ?";
-                       $boundCondition[] = $since_id;
+                       $boundCondition = DBA::mergeConditions($boundCondition, ['`id` > ?', $since_id]);
                }
 
                $params['limit'] = $limit;
 
                $models = $this->selectModels($boundCondition, $params);
 
-               $totalCount = DBA::count(static::$table_name, $condition);
-
                return new static::$collection_class($models, $totalCount);
        }