projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| fb98beff ER |
1 | diff -up php-5.2.17/ext/date/php_date.c.bug-52063 php-5.2.17/ext/date/php_date.c |
| 2 | --- php-5.2.17/ext/date/php_date.c.bug-52063 2011-08-28 09:44:11.000000000 +0700 | |
| 3 | +++ php-5.2.17/ext/date/php_date.c 2011-08-28 09:45:09.000000000 +0700 | |
| 4 | @@ -1778,7 +1778,7 @@ PHP_FUNCTION(date_create) | |
| 5 | char *time_str = NULL; | |
| 6 | int time_str_len = 0; | |
| 7 | ||
| 8 | - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO", &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { | |
| 9 | + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { | |
| 10 | RETURN_FALSE; | |
| 11 | } | |
| 12 | ||
| 13 | @@ -1799,7 +1799,7 @@ PHP_METHOD(DateTime, __construct) | |
| 14 | int time_str_len = 0; | |
| 15 | ||
| 16 | php_set_error_handling(EH_THROW, NULL TSRMLS_CC); | |
| 17 | - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { | |
| 18 | + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { | |
| 19 | date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, timezone_object, 1 TSRMLS_CC); | |
| 20 | } | |
| 21 | php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC); |