- Fix non-RFC dates formatting (#1484901)

1 files changed, 13 insertions, 3 deletions

diff --git a/program/include/main.inc b/program/include/main.inc
index 09a53f0ad..b5004e899 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1507,12 +1507,22 @@ function format_date($date, $format=NULL)
   global $CONFIG, $sess_user_lang;
   
   $ts = NULL;
-  
+
   if (is_numeric($date))
     $ts = $date;
   else if (!empty($date))
-    $ts = @strtotime($date);
-    
+    {
+    while (($ts = @strtotime($date))===false)
+      {
+        // if we have a date in non-rfc format
+	// remove token from the end and try again
+        $d = explode(' ', $date);
+	array_pop($d);
+	if (!$d) break;
+	$date = implode(' ', $d);
+      }
+    }
+
   if (empty($ts))
     return '';