Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect...

[friendica.git] / include / dbm.php

diff --git a/include/dbm.php b/include/dbm.php
index d28d49d63b4b53647392f5d6c928fdba5b76d3bf..fedc2e4fdb23881e694a7b2cbb3e218f5844614d 100644 (file)
--- a/include/dbm.php
+++ b/include/dbm.php
@@ -96,11 +96,18 @@ class dbm {
        public static function date($date = 'now') {
                $timestamp = strtotime($date);
 
-               // Don't allow lower date strings as '0001-01-01 00:00:00'
+               // Workaround for 3.5.1
                if ($timestamp < -62135596800) {
-                       $timestamp = -62135596800;
+                       return '0000-00-00 00:00:00';
                }
 
+               // 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);
        }
 }