Simplify the code / check number of parameters in mergeConditions

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 273c87690b45b6b61b2944f3e7cc7e6cdd94fef0..b45f7cfb24a1aa1c128297c30c8a4f12e8a6d07e 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -669,6 +669,10 @@ class DBA
         */
        public static function mergeConditions(array ...$conditions)
        {
+               if (count($conditions) == 1) {
+                       return current($conditions);
+               }
+
                $conditionStrings = [];
                $result = [];
 

diff --git a/src/Model/Item.php b/src/Model/Item.php
index d780010944bec33c831ba2be7fe1f78193a62be1..af19ec16a7abf99f13697d250a52769e5b048d58 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -201,11 +201,7 @@ class Item
                        return [];
                }
 
-               if (!empty($condition)) {
-                       $condition = DBA::mergeConditions(['iid' => $pinned], $condition);
-               } else {
-                       $condition = ['iid' => $pinned];
-               }
+               $condition = DBA::mergeConditions(['iid' => $pinned], $condition);
 
                return self::selectThreadForUser($uid, $selected, $condition, $params);
        }