Merge pull request #9146 from tobiasd/2020.09-CHANGELOG

[friendica.git] / src / Database / DBA.php

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 273c87690b45b6b61b2944f3e7cc7e6cdd94fef0..babc4500eb0c24a568a50c1823523879002b6d02 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -669,10 +669,18 @@ class DBA
         */
        public static function mergeConditions(array ...$conditions)
        {
+               if (count($conditions) == 1) {
+                       return current($conditions);
+               }
+
                $conditionStrings = [];
                $result = [];
 
                foreach ($conditions as $key => $condition) {
+                       if (!$condition) {
+                               continue;
+                       }
+
                        $condition = self::collapseCondition($condition);
 
                        $conditionStrings[] = array_shift($condition);