Commit: a1e97bada8894549af030b645d10d39222dfb9c6 Author: Gustavo André dos Santos Lopes <cataphr...@php.net> Fri, 25 May 2012 11:55:50 +0200 Parents: c8d8d2442e49750115cab10bd38988b7355baa54 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a1e97bada8894549af030b645d10d39222dfb9c6 Log: Fixed problem in IntlCalendar debug handler *is_temp was not being set. Also deleted a redundant assignment to *is_temp in IntlTimeZone. Changed paths: M ext/intl/calendar/calendar_class.cpp M ext/intl/timezone/timezone_class.cpp Diff: diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp index 43cbc4a..130c6b5 100644 --- a/ext/intl/calendar/calendar_class.cpp +++ b/ext/intl/calendar/calendar_class.cpp @@ -143,6 +143,8 @@ static HashTable *Calendar_get_debug_info(zval *object, int *is_temp TSRMLS_DC) Calendar_object *co; const Calendar *cal; + *is_temp = 1; + array_init_size(&zv, 8); co = (Calendar_object*)zend_object_store_get_object(object TSRMLS_CC); @@ -204,8 +206,6 @@ static HashTable *Calendar_get_debug_info(zval *object, int *is_temp TSRMLS_DC) add_assoc_zval_ex(&zv, "fields", sizeof("fields"), zfields); - *is_temp = 1; - return Z_ARRVAL(zv); } /* }}} */ diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp index a1a9866..4034838 100644 --- a/ext/intl/timezone/timezone_class.cpp +++ b/ext/intl/timezone/timezone_class.cpp @@ -395,8 +395,6 @@ static HashTable *TimeZone_get_debug_info(zval *object, int *is_temp TSRMLS_DC) add_assoc_long_ex(&zv, "currentOffset", sizeof("currentOffset"), (long)(rawOffset + dstOffset)); - *is_temp = 1; - return Z_ARRVAL(zv); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
