summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli_prop.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mysqli/mysqli_prop.c')
-rw-r--r--ext/mysqli/mysqli_prop.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index db7b637728..00170e3d54 100644
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -105,7 +105,14 @@ static int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
if (!c) {\
ZVAL_NULL(*retval);\
} else {\
- ZVAL_STRING(*retval, c, 1);\
+ if (UG(unicode)) {\
+ UChar *ubuf = NULL;\
+ uint ulen;\
+ zend_string_to_unicode(MYSQLI_CONV_UTF8, &ubuf, &ulen, c, strlen(c));\
+ ZVAL_UNICODEL(*retval, ubuf, ulen, 0);\
+ } else {\
+ ZVAL_STRING(*retval, c, 1);\
+ }\
}\
}\
return SUCCESS;\