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/php_mysqlnd.c | |
| parent | 02fe66d1e04a0ef6abcd30033f95aac3c132c6be (diff) | |
| download | php-git-dcd86aebd24acbcd24b0740238a1e93ab9ef9d4b.tar.gz | |
- MFH: Removed UG(unicode) checks
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index 904616c51c..7ebb748024 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -51,23 +51,19 @@ PHPAPI void mysqlnd_minfo_print_hash(zval *values) zstr string_key; uint string_key_len; ulong num_key; + int s_len; char *s = NULL; zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &string_key, &string_key_len, &num_key, 0, &pos_values); convert_to_string(*values_entry); - if (UG(unicode)) { - int s_len; - if (zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), - &s, &s_len, string_key.u, string_key_len TSRMLS_CC) == SUCCESS) { - php_info_print_table_row(2, s, Z_STRVAL_PP(values_entry)); - } - if (s) { - mnd_efree(s); - } - } else { - php_info_print_table_row(2, string_key.s, Z_STRVAL_PP(values_entry)); + if (zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), + &s, &s_len, string_key.u, string_key_len TSRMLS_CC) == SUCCESS) { + php_info_print_table_row(2, s, Z_STRVAL_PP(values_entry)); + } + if (s) { + mnd_efree(s); } zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos_values); |