convert non-strings to unicode in unicode mode

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index d1cd6355ab2e9fd2da2dec472af1df02bb5f8388..d6fdb01246e9ddc27eef2e56beee83f7e398c261 100644 (file)
--- 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;