diff options
| author | Johannes Schlüter <johannes@php.net> | 2010-02-11 21:42:48 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2010-02-11 21:42:48 +0000 |
| commit | a61bf9318b3d184d58cb3268cdae545a2cabf719 (patch) | |
| tree | 421d7dc5fe2eb9d0b35a47411d605c843bb334c0 /ext/mysqli/mysqli.c | |
| parent | 66d59b7bb41849b18804c9febf64684539bb1c33 (diff) | |
| download | php-git-a61bf9318b3d184d58cb3268cdae545a2cabf719.tar.gz | |
revert 293939 Fixed bug #50636 (MySQLi_Result sets values before calling
constructor)
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index cf02be36ff..342e3eb78e 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1236,6 +1236,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags zval *retval_ptr; object_and_properties_init(return_value, ce, NULL); + zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC); if (ce->constructor) { fci.size = sizeof(fci); @@ -1291,8 +1292,6 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags } else if (ctor_params) { zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Class %v does not have a constructor hence you cannot use ctor_params", ce->name); } - - zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC); } } /* }}} */ |