Fixed bug #29342 (strtotime() does not handle empty date string properly).

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 4e455a86a09c316bb886206d078f187e06774678..694668198dcc8434459d27e016963ffac2a80566 100644 (file)
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -1080,8 +1080,10 @@ PHP_FUNCTION(strtotime)
        }
 
        convert_to_string_ex(z_time);
-       if (Z_STRLEN_PP(z_time) == 0)
-               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Called with empty time parameter");
+       if (!Z_STRLEN_PP(z_time)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Called with an empty time parameter.");
+               RETURN_LONG(-1);
+       }
        if (argc == 2) {
                convert_to_long_ex(z_now);
                now = Z_LVAL_PP(z_now);