diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-11-27 19:02:45 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-11-27 19:02:45 +0000 |
| commit | e5454b359aa949385bc6f8b0a71e17f4caef87f8 (patch) | |
| tree | 4f0f9ba517bea25be384bed5b2b12b3e5b3fcc51 /ext/mysqli/mysqli.c | |
| parent | 496ec83e38071bfd3b2a4dae0464231b89a0a657 (diff) | |
| download | php-git-e5454b359aa949385bc6f8b0a71e17f4caef87f8.tar.gz | |
Fixed bug #46409 (__invoke method called outside of object context when using array_map)
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 861952d6ca..6d168fe28d 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1313,7 +1313,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags fci.function_table = &ce->function_table; fci.function_name = NULL; fci.symbol_table = NULL; - fci.object_pp = &return_value; + fci.object_ptr = return_value; fci.retval_ptr_ptr = &retval_ptr; if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) { if (Z_TYPE_P(ctor_params) == IS_ARRAY) { @@ -1347,7 +1347,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); fcc.called_scope = Z_OBJCE_P(return_value); - fcc.object_pp = &return_value; + fcc.object_ptr = return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Could not execute %v::%v()", ce->name, ce->constructor->common.function_name); |