Merge pull request #9500 from MrPetovan/bug/9326-owner-view-blocked

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

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index b45f7cfb24a1aa1c128297c30c8a4f12e8a6d07e..7dd7ac3e3a4d111d46d90752f2f47f8d664cdb24 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -72,6 +72,16 @@ class DBA
                return DI::dba()->getConnection();
        }
 
+       /**
+        * Return the database driver string
+        *
+        * @return string with either "pdo" or "mysqli"
+        */
+       public static function getDriver()
+       {
+               return DI::dba()->getDriver();
+       }
+
        /**
         * Returns the MySQL server version string
         *
@@ -677,6 +687,10 @@ class DBA
                $result = [];
 
                foreach ($conditions as $key => $condition) {
+                       if (!$condition) {
+                               continue;
+                       }
+
                        $condition = self::collapseCondition($condition);
 
                        $conditionStrings[] = array_shift($condition);