bjori Sun Sep 10 16:34:08 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date php_date.c
Log:
MFH: date_timezone_set() needs both arguments
MFH: throw exception in DateTimeZone::__construct() when no arguments are
passed
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.28&r2=1.43.2.45.2.29&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.28
php-src/ext/date/php_date.c:1.43.2.45.2.29
--- php-src/ext/date/php_date.c:1.43.2.45.2.28 Tue Sep 5 12:39:20 2006
+++ php-src/ext/date/php_date.c Sun Sep 10 16:34:08 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.28 2006/09/05 12:39:20 nlopess Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.29 2006/09/10 16:34:08 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1848,7 +1848,7 @@
php_date_obj *dateobj;
php_timezone_obj *tzobj;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"O|O", &object, date_ce_date, &timezone_object, date_ce_timezone) == FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"OO", &object, date_ce_date, &timezone_object, date_ce_timezone) == FAILURE) {
RETURN_FALSE;
}
dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
@@ -1978,13 +1978,13 @@
int tz_len;
timelib_tzinfo *tzi = NULL;
+ php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&tz, &tz_len)) {
- php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
if (SUCCESS == timezone_initialize(&tzi, tz TSRMLS_CC)) {
((php_timezone_obj *)
zend_object_store_get_object(getThis() TSRMLS_CC))->tz = tzi;
}
- php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
}
+ php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
}
PHP_FUNCTION(timezone_name_get)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
