derick Mon Sep 3 12:03:46 2007 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
- Fixed DateTimeZone::getTransitions().
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.143&r2=1.144&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.143 php-src/ext/date/php_date.c:1.144
--- php-src/ext/date/php_date.c:1.143 Fri Jul 13 15:22:34 2007
+++ php-src/ext/date/php_date.c Mon Sep 3 12:03:46 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.143 2007/07/13 15:22:34 dmitry Exp $ */
+/* $Id: php_date.c,v 1.144 2007/09/03 12:03:46 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2315,7 +2315,11 @@
MAKE_STD_ZVAL(element);
array_init(element);
add_ascii_assoc_long(element, "ts", tzobj->tz->trans[i]);
- add_ascii_assoc_string(element, "time",
php_format_date(DATE_FORMAT_ISO8601, 13, tzobj->tz->trans[i], 0 TSRMLS_CC), 0);
+ if (UG(unicode)) {
+ add_assoc_unicode(element, "time", (UChar*)
php_format_date(DATE_FORMAT_ISO8601, 13, tzobj->tz->trans[i], 0 TSRMLS_CC), 0);
+ } else {
+ add_assoc_string(element, "time",
php_format_date(DATE_FORMAT_ISO8601, 13, tzobj->tz->trans[i], 0 TSRMLS_CC), 0);
+ }
add_ascii_assoc_long(element, "offset",
tzobj->tz->type[tzobj->tz->trans_idx[i]].offset);
add_ascii_assoc_bool(element, "isdst",
tzobj->tz->type[tzobj->tz->trans_idx[i]].isdst);
add_ascii_assoc_ascii_string(element, "abbr",
&tzobj->tz->timezone_abbr[tzobj->tz->type[tzobj->tz->trans_idx[i]].abbr_idx],
1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
