diff options
| author | Felipe Pena <felipe@php.net> | 2009-03-27 19:28:26 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-03-27 19:28:26 +0000 |
| commit | 04c90a0f510b0524ea1b4151841d41208520a48e (patch) | |
| tree | ebf20eab8aedcca2b0ba59126d7b2ec27187d055 /ext/mysqlnd/mysqlnd_ps_codec.c | |
| parent | fe23a6b147175ec35a40053ac362e37c6f6148f0 (diff) | |
| download | php-git-04c90a0f510b0524ea1b4151841d41208520a48e.tar.gz | |
- Removed:
- UG(unicode) checks
- Changed:
- ZEND_STR_TYPE -> IS_UNICODE
- convert_to_text -> convert_to_unicode
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 |