cvs: php-src /ext/date php_date.c
| From: | Derick Rethans | Date: | Wed, 07 Sep 2005 19:09:27 +0000 |
| Subject: | cvs: php-src /ext/date php_date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33847@lists.php.net to get a copy of this message | ||
derick Wed Sep 7 15:09:27 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
- Fix buglett with date() that cause truncated strings to be returned when
Unicode is turned on.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.52&r2=1.53&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.52 php-src/ext/date/php_date.c:1.53
--- php-src/ext/date/php_date.c:1.52 Fri Sep 2 10:57:41 2005
+++ php-src/ext/date/php_date.c Wed Sep 7 15:09:27 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.52 2005/09/02 14:57:41 derick Exp $ */
+/* $Id: php_date.c,v 1.53 2005/09/07 19:09:27 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -596,8 +596,12 @@
}
string = php_format_date(format, format_len, ts, localtime TSRMLS_CC);
-
- RETVAL_STRING(string, 0);
+
+ if (UG(unicode)) {
+ RETVAL_UNICODE(string, 0);
+ } else {
+ RETVAL_STRING(string, 0);
+ }
}
/* }}} */