Merged changes up to 2.3.16 into unstable

[fa-stable.git] / includes / date_functions.inc

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 17a86ff7cf926101adaa8a6d0d69c21120f1fa14..795b96e25ccf1d9107859c8bbb8b84537d599159 100644 (file)
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -347,8 +347,6 @@ function sql2date($date_)
        global $date_system;
 
        //for MySQL dates are in the format YYYY-mm-dd
-       if ($date_ == null || strlen($date_) == 0)
-               return "";
 
        if (strpos($date_, "/")) 
        { // In MySQL it could be either / or -
@@ -358,6 +356,8 @@ function sql2date($date_)
        {
                list($year, $month, $day) = explode("-", $date_);
        }
+       if (!isset($day)) // data format error
+               return "";
 
        if (strlen($day) > 4) 
        {  /*chop off the time stuff */