Merge pull request #3879 from zeroadam/Remove-Includes-#3873

[friendica.git] / include / dbm.php

diff --git a/include/dbm.php b/include/dbm.php
index db50dae89c95eefe8796aeb4ddd835491278b75e..1be1647a4633f798ecf9da0420f5cfebed037ca4 100644 (file)
--- a/include/dbm.php
+++ b/include/dbm.php
@@ -41,7 +41,7 @@ class dbm {
         * Checks if $array is a filled array with at least one entry.
         *
         * @param       $array  mixed   A filled array with at least one entry
-        * @return      Whether $array is a filled array
+        * @return      Whether $array is a filled array or an object with rows
         */
        public static function is_result($array) {
                // It could be a return value from an update statement
@@ -50,10 +50,10 @@ class dbm {
                }
 
                if (is_object($array)) {
-                       return true;
+                       return dba::num_rows($array) > 0;
                }
 
-               return (is_array($array) && count($array) > 0);
+               return (is_array($array) && (count($array) > 0));
        }
 
        /**
@@ -76,7 +76,7 @@ class dbm {
 
                if (is_bool($value)) {
                        $value = ($value ? 'true' : 'false');
-               } elseif (is_float($value) OR is_integer($value)) {
+               } elseif (is_float($value) || is_integer($value)) {
                        $value = (string)$value;
                } else {
                         $value = "'".dbesc($value)."'";
@@ -107,6 +107,6 @@ class dbm {
                        $timestamp = -62135596800;
                }
 
-               return date('Y-m-d H:i:s', $timestamp);
+               return date('Y-m-d H:i:s', (int)$timestamp);
        }
 }