diff options
| author | Felipe Pena <felipe@php.net> | 2009-03-30 16:52:33 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-03-30 16:52:33 +0000 |
| commit | dcd86aebd24acbcd24b0740238a1e93ab9ef9d4b (patch) | |
| tree | bd736429240453a6fd9269756a3776c507d3a1c7 /ext/mysqlnd/mysqlnd_debug.c | |
| parent | 02fe66d1e04a0ef6abcd30033f95aac3c132c6be (diff) | |
| download | php-git-dcd86aebd24acbcd24b0740238a1e93ab9ef9d4b.tar.gz | |
- MFH: Removed UG(unicode) checks
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index 8dc117617d..b83e18d0d3 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -1107,6 +1107,7 @@ static int mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list TRACE_APPEND_STR("Array, "); break; case IS_OBJECT: { + zval tmp; zstr class_name; zend_uint class_name_len; int dup; @@ -1115,16 +1116,11 @@ static int mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list dup = zend_get_object_classname(*arg, &class_name, &class_name_len TSRMLS_CC); - if (UG(unicode)) { - zval tmp; + ZVAL_UNICODEL(&tmp, class_name.u, class_name_len, 1); + convert_to_string_with_converter(&tmp, ZEND_U_CONVERTER(UG(output_encoding_conv))); + TRACE_APPEND_STRL(Z_STRVAL(tmp), Z_STRLEN(tmp)); + zval_dtor(&tmp); - ZVAL_UNICODEL(&tmp, class_name.u, class_name_len, 1); - convert_to_string_with_converter(&tmp, ZEND_U_CONVERTER(UG(output_encoding_conv))); - TRACE_APPEND_STRL(Z_STRVAL(tmp), Z_STRLEN(tmp)); - zval_dtor(&tmp); - } else { - TRACE_APPEND_STRL(class_name.s, class_name_len); - } if(!dup) { efree(class_name.v); } |