diff options
| author | Xinchen Hui <laruence@php.net> | 2013-04-27 23:41:51 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-04-27 23:41:51 +0800 |
| commit | 1c07590ed7bf8b5fca9f232eae321e26f05acbd9 (patch) | |
| tree | 76e0a1b42c1aaec17146d1ca1f90dc69439c556e /ext/mysqli/mysqli.c | |
| parent | ca148c030fd71203ea026263ce99be3ec49f0865 (diff) | |
| parent | 8f5a534b215905790a4dd5465804c1fbc21468c4 (diff) | |
| download | php-git-1c07590ed7bf8b5fca9f232eae321e26f05acbd9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
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 1731bb70f4..d14b616827 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1271,7 +1271,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags php_mysqli_fetch_into_hash_aux(return_value, result, fetchtype TSRMLS_CC); - if (into_object && Z_TYPE_P(return_value) != IS_NULL) { + if (into_object && Z_TYPE_P(return_value) == IS_ARRAY) { zval dataset = *return_value; zend_fcall_info fci; zend_fcall_info_cache fcc; |