diff options
| author | Anatol Belski <ab@php.net> | 2013-07-16 18:05:45 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-07-16 18:05:45 +0200 |
| commit | fd5cdf89a8ddde4c5a9cf4cfb95415de07caf7b9 (patch) | |
| tree | 7c4568007bbfd258f76f3bd4bb7478a05f564124 /ext/mysqli/mysqli.c | |
| parent | f37ac6f5912d605633e0abf6310255b9d851d078 (diff) | |
| parent | bb6d74918ea66099cf36c5509e844df0f15a7515 (diff) | |
| download | php-git-fd5cdf89a8ddde4c5a9cf4cfb95415de07caf7b9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix TS build
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index b6cf025c1e..ad4e25c66f 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -531,7 +531,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_ #include "ext/mysqlnd/mysqlnd_reverse_api.h" static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC) { - if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry) TSRMLS_CC) { + if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry TSRMLS_CC)) { MY_MYSQL * mysql; MYSQLI_RESOURCE * my_res; mysqli_object * intern = (mysqli_object *)zend_object_store_get_object(zv TSRMLS_CC); |