Merge pull request #3417 from fabrixxm/feature/frio/admintemplates

[friendica.git] / include / dbm.php

diff --git a/include/dbm.php b/include/dbm.php
index 0e12417501efd8cdae28eee5a7e00b8f7c3c39a0..3430577da6a05665b0e93445f0b973c9745e216f 100644 (file)
--- a/include/dbm.php
+++ b/include/dbm.php
@@ -2,6 +2,7 @@
 /**
  * @brief This class contain functions for the database management
  *
+ * This class contains functions that doesn't need to know if pdo, mysqli or whatever is used.
  */
 class dbm {
        /**
@@ -47,6 +48,11 @@ class dbm {
                if (is_bool($array)) {
                        return $array;
                }
+
+               if (is_object($array)) {
+                       return true;
+               }
+
                return (is_array($array) && count($array) > 0);
        }
 
@@ -93,9 +99,15 @@ class dbm {
         * @param string $date a date string in any format
         * @return string SQL style date string
         */
-       public static function date($date) {
+       public static function date($date = 'now') {
                $timestamp = strtotime($date);
-               return date('Y-m-d H:i:s');
+
+               // Don't allow lower date strings as '0001-01-01 00:00:00'
+               if ($timestamp < -62135596800) {
+                       $timestamp = -62135596800;
+               }
+
+               return date('Y-m-d H:i:s', $timestamp);
        }
 }
 ?>