MFH: Fixed bug #26565 (strtotime("this month") resolving to the wrong month)

diff --git a/NEWS b/NEWS
index 5be87c0df1c46bda9f45029660c4b37fb19526a5..eb1de29df4b5cb06b6598055af52b01a2a00a058 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP 4                                                                      NEWS
   (Jani)
 - Fixed header handler in NSAPI SAPI module (header->replace was ignored,
   send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26565 (strtotime("this month") resolving to the wrong month).
+  (Jani)
 - Fixed bug #26564 (ncurses5 has headers in PREFIX/include/ncurses/). (Jani)
 - Fixed bug #26548 (ext/session: Malformed HTTP dates headers). (Derick)
 - Fixed bug #26531 (ext/domxml: get_elements_by_tag_name() wildcard fails).

diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y
index 88e8f53c474c3bf6e4cad894a0c64e6ef420bace..9fa8c79c30d03003d5808790997162d673d39fdc 100644 (file)
--- a/ext/standard/parsedate.y
+++ b/ext/standard/parsedate.y
@@ -513,7 +513,7 @@ static TABLE const OtherTable[] = {
     { "today",         tDAY_UNIT,      0 },
     { "now",           tDAY_UNIT,      0 },
     { "last",          tUNUMBER,       -1 },
-    { "this",          tMINUTE_UNIT,   0 },
+    { "this",          tUNUMBER,       0 },
     { "next",          tUNUMBER,       2 },
     { "first",         tUNUMBER,       1 },
 /*  { "second",                tUNUMBER,       2 }, */