X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdbm.php;h=1be1647a4633f798ecf9da0420f5cfebed037ca4;hb=52226066022de840cb73424aab7d3a3348467de7;hp=fedc2e4fdb23881e694a7b2cbb3e218f5844614d;hpb=6a165656426a533848554e7b8e0fae2e70f21399;p=friendica.git

diff --git a/include/dbm.php b/include/dbm.php
index fedc2e4fdb..1be1647a46 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 {
 	/**
@@ -40,14 +41,19 @@ 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
 		if (is_bool($array)) {
 			return $array;
 		}
-		return (is_array($array) && count($array) > 0);
+
+		if (is_object($array)) {
+			return dba::num_rows($array) > 0;
+		}
+
+		return (is_array($array) && (count($array) > 0));
 	}
 
 	/**
@@ -70,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)."'";
@@ -96,19 +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 '0000-00-00 00:00:00';
+			$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);
+		return date('Y-m-d H:i:s', (int)$timestamp);
 	}
 }
-?>