Fix: Empty answers in DFRN can be okay

[friendica.git] / src / Util / DateTimeFormat.php

diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php
index 10810da0342798193361093624edf4b5f4e9ff6e..e293857acdd14a937fbc45b19bffe31fc4aecfce 100644 (file)
--- a/src/Util/DateTimeFormat.php
+++ b/src/Util/DateTimeFormat.php
@@ -90,12 +90,12 @@ class DateTimeFormat
        {
                // Defaults to UTC if nothing is set, but throws an exception if set to empty string.
                // Provide some sane defaults regardless.
-               if ($from === '') {
-                       $from = 'UTC';
+               if ($tz_from === '') {
+                       $tz_from = 'UTC';
                }
 
-               if ($to === '') {
-                       $to = 'UTC';
+               if ($tz_to === '') {
+                       $tz_to = 'UTC';
                }
 
                if (($s === '') || (!is_string($s))) {
@@ -109,6 +109,9 @@ class DateTimeFormat
                 * months and days always start with 1.
                 */
                if (substr($s, 0, 10) <= '0001-01-01') {
+                       if ($s < '0000-00-00') {
+                               $s = '0000-00-00';
+                       }
                        $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC'));
                        return str_replace('1', '0', $d->format($format));
                }
@@ -122,7 +125,7 @@ class DateTimeFormat
                try {
                        $d = new DateTime($s, $from_obj);
                } catch (Exception $e) {
-                       logger('datetime_convert: exception: ' . $e->getMessage());
+                       logger('DateTimeFormat::convert: exception: ' . $e->getMessage());
                        $d = new DateTime('now', $from_obj);
                }