From: Antony Dovgal <tony2001@php.net>
Date: Sat, 28 Apr 2007 12:04:43 +0000 (+0000)
Subject: convert non-strings to unicode in unicode mode
X-Git-Tag: RELEASE_1_2_0~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b0e0787f86437c097453f337c9d82dd05cc500c;p=php

convert non-strings to unicode in unicode mode
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index d1cd6355ab..d6fdb01246 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1697,7 +1697,7 @@ ZEND_API int concat_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 	int use_copy1, use_copy2;
 	zend_uchar result_type;
 
-	if (Z_TYPE_P(op1) == IS_UNICODE || Z_TYPE_P(op2) == IS_UNICODE) {
+	if (Z_TYPE_P(op1) == IS_UNICODE || Z_TYPE_P(op2) == IS_UNICODE || UG(unicode)) {
 		zend_make_unicode_zval(op1, &op1_copy, &use_copy1);
 		zend_make_unicode_zval(op2, &op2_copy, &use_copy2);
 		result_type = IS_UNICODE;