From: Marcus Boerger <helly@php.net>
Date: Sat, 3 Jun 2006 11:01:40 +0000 (+0000)
Subject: - Printable is supposed to return nativ/unicode depending on ini setting
X-Git-Tag: RELEASE_1_0_0RC1~2798
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c870888d069390ffa885211dfd05629a47d3d72c;p=php

- Printable is supposed to return nativ/unicode depending on ini setting
---

diff --git a/Zend/zend.c b/Zend/zend.c
index b848f6d91c..9e2bbce03c 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -382,7 +382,7 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 			Z_STRVAL_P(expr_copy) = estrndup("Array", Z_STRLEN_P(expr_copy));
 			break;
 		case IS_OBJECT:
-			if(Z_OBJ_HT_P(expr)->cast_object && Z_OBJ_HANDLER_P(expr, cast_object)(expr, expr_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
+			if(Z_OBJ_HT_P(expr)->cast_object && Z_OBJ_HANDLER_P(expr, cast_object)(expr, expr_copy, UG(unicode)?IS_UNICODE:IS_STRING TSRMLS_CC) == SUCCESS) {
 				break;
 			}
 			if (Z_OBJ_HANDLER_P(expr, get)) {