From: Hannes Magnusson <bjori@php.net>
Date: Fri, 3 Nov 2006 15:06:51 +0000 (+0000)
Subject: MFH: Add "wrong param" warning to strtotime()
X-Git-Tag: php-5.2.1RC1~358
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91c604d584e858bba4fadc2ad0d53ccb3e206191;p=php

MFH: Add "wrong param" warning to strtotime()
---

diff --git a/README.UPDATE_5_2 b/README.UPDATE_5_2
index 4470a23f4c..78f69c816a 100644
--- a/README.UPDATE_5_2
+++ b/README.UPDATE_5_2
@@ -309,6 +309,16 @@ bzopen($fp, "r");
 
 ?>
 
+In the date extension
+=====================
+
+<?php
+
+strtotime("today", "now");'
+/* Warning:  strtotime() expects parameter 2 to be long, string given in filename on line n */
+
+?>
+
 In the dBase extension
 ======================
 
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 687ca122ca..2743f9949c 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1083,7 +1083,7 @@ PHP_FUNCTION(strtotime)
 		timelib_unixtime2local(now, t->sse);
 		timelib_time_dtor(t);
 		efree(initial_ts);
-	} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s", &times, &time_len) != FAILURE) {
+	} else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &times, &time_len, &preset_ts) != FAILURE) {
 		/* We have no initial timestamp */
 		now = timelib_time_ctor();
 		now->tz_info = tzi;