diff options
| author | Hannes Magnusson <bjori@php.net> | 2006-11-03 15:06:51 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2006-11-03 15:06:51 +0000 |
| commit | 91c604d584e858bba4fadc2ad0d53ccb3e206191 (patch) | |
| tree | 44beddbb21686f59b72fec29bd9e269f1dcbe9dd | |
| parent | 0c7e63a07e566145ac51ab5957bf9f030168e550 (diff) | |
| download | php-git-91c604d584e858bba4fadc2ad0d53ccb3e206191.tar.gz | |
MFH: Add "wrong param" warning to strtotime()
| -rw-r--r-- | README.UPDATE_5_2 | 10 | ||||
| -rw-r--r-- | ext/date/php_date.c | 2 |
2 files changed, 11 insertions, 1 deletions
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", ×, &time_len) != FAILURE) { + } else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", ×, &time_len, &preset_ts) != FAILURE) { /* We have no initial timestamp */ now = timelib_time_ctor(); now->tz_info = tzi; |