andrei Mon Dec 18 20:40:51 2006 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Fix macro.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.835&r2=1.836&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.835
php-src/ext/standard/basic_functions.c:1.836
--- php-src/ext/standard/basic_functions.c:1.835 Mon Dec 18 20:39:40 2006
+++ php-src/ext/standard/basic_functions.c Mon Dec 18 20:40:51 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.835 2006/12/18 20:39:40 andrei Exp $ */
+/* $Id: basic_functions.c,v 1.836 2006/12/18 20:40:51 andrei Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -6215,7 +6215,9 @@
*element = *arg2;
zval_copy_ctor(element);
INIT_PZVAL(element);
- convert_to_text_with_converter(element, UG(utf8_conv));
+ if (UG(unicode)) {
+ convert_to_unicode_with_converter(element,
UG(utf8_conv));
+ }
add_next_index_zval(hash, element);
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
