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_ps_codec.c | |
parent | 02fe66d1e04a0ef6abcd30033f95aac3c132c6be (diff) | |
download | php-git-dcd86aebd24acbcd24b0740238a1e93ab9ef9d4b.tar.gz |
- MFH: Removed UG(unicode) checks
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps_codec.c')
-rw-r--r-- | ext/mysqlnd/mysqlnd_ps_codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c index b6d4a7902b..673523c77c 100644 --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@ -685,7 +685,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT *stmt, zend_uchar **buf, zend_uch #if PHP_MAJOR_VERSION < 6 if (Z_TYPE_P(the_var) != IS_STRING) #elif PHP_MAJOR_VERSION >= 6 - if (Z_TYPE_P(the_var) != IS_STRING || (UG(unicode) && Z_TYPE_P(the_var) == IS_UNICODE)) + if (Z_TYPE_P(the_var) != IS_STRING || Z_TYPE_P(the_var) == IS_UNICODE) #endif { if (!copies || !copies[i]) { @@ -693,7 +693,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT *stmt, zend_uchar **buf, zend_uch } the_var = copies[i]; #if PHP_MAJOR_VERSION >= 6 - if (UG(unicode) && Z_TYPE_P(the_var) == IS_UNICODE) { + if (Z_TYPE_P(the_var) == IS_UNICODE) { zval_unicode_to_string_ex(the_var, UG(utf8_conv) TSRMLS_CC); } #endif |