X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdbm.php;h=3430577da6a05665b0e93445f0b973c9745e216f;hb=0135b7e357064f5fc6e0983991e297b729b6f87a;hp=eb3e2d038251323921e6263eaf94fbbcde745931;hpb=0afb0c2ea407a9dbde217d2d88edb75f7402a810;p=friendica.git

diff --git a/include/dbm.php b/include/dbm.php
index eb3e2d0382..3430577da6 100644
--- 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);
 	}
 
@@ -96,18 +102,11 @@ class dbm {
 	public static function date($date = 'now') {
 		$timestamp = strtotime($date);
 
-		// Workaround for 3.5.1
+		// Don't allow lower date strings as '0001-01-01 00:00:00'
 		if ($timestamp < -62135596800) {
-			return NULL_DATE;
+			$timestamp = -62135596800;
 		}
 
-		// The above will be removed in 3.5.2
-		// The following will then be enabled
-		// 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);
 	}
 }