derick Wed Sep 27 18:32:24 2006 UTC
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/tests oo_001.phpt oo_002.phpt
Log:
- Return timezone's names as Unicode strings.
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.118&r2=1.119&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.118 php-src/ext/date/php_date.c:1.119
--- php-src/ext/date/php_date.c:1.118 Tue Sep 19 10:38:30 2006
+++ php-src/ext/date/php_date.c Wed Sep 27 18:32:24 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.118 2006/09/19 10:38:30 dmitry Exp $ */
+/* $Id: php_date.c,v 1.119 2006/09/27 18:32:24 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2190,7 +2190,7 @@
tzobj = (php_timezone_obj *) zend_object_store_get_object(object
TSRMLS_CC);
DATE_CHECK_INITIALIZED(tzobj->tz, DateTimeZone);
- RETURN_STRING(tzobj->tz->name, 1);
+ RETURN_ASCII_STRING(tzobj->tz->name, 1);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/oo_001.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/date/tests/oo_001.phpt
diff -u php-src/ext/date/tests/oo_001.phpt:1.4
php-src/ext/date/tests/oo_001.phpt:1.5
--- php-src/ext/date/tests/oo_001.phpt:1.4 Mon Aug 7 21:42:27 2006
+++ php-src/ext/date/tests/oo_001.phpt Wed Sep 27 18:32:24 2006
@@ -57,7 +57,7 @@
Warning: DateTime::format(): The DateTime object has not been correctly
initialized by its constructor in %soo_001.php on line %d
bool(false)
DateTime::__construct(): Failed to parse time string (1am todax) at position 4
(t): The timezone could not be found in the database
-string(3) "UTC"
+unicode(3) "UTC"
Warning: DateTimeZone::getName(): The DateTimeZone object has not been
correctly initialized by its constructor in %soo_001.php on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/oo_002.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/date/tests/oo_002.phpt
diff -u php-src/ext/date/tests/oo_002.phpt:1.4
php-src/ext/date/tests/oo_002.phpt:1.5
--- php-src/ext/date/tests/oo_002.phpt:1.4 Tue Sep 19 11:26:53 2006
+++ php-src/ext/date/tests/oo_002.phpt Wed Sep 27 18:32:24 2006
@@ -31,5 +31,5 @@
unicode(29) "Tue, 01 Aug 06 13:00:00 +0000"
unicode(29) "Tue, 01 Aug 06 14:00:00 +0000"
unicode(29) "Tue, 01 Aug 06 12:59:59 +0000"
-string(10) "Asia/Tokyo"
-string(10) "Asia/Tokyo"
+unicode(10) "Asia/Tokyo"
+unicode(10) "Asia/Tokyo"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
