mirror of
https://github.com/bdnugget/php-src.git
synced 2026-11-07 09:17:29 +00:00
Remove called_scope inheritance in zend_call_method()
Similar to 097043db2a, but for the
zend_call_method() API. I don't think we ever use this for
static methods, but this logic shouldn't be there. If you want
to inherit the active LSB scope for some reason, do so explicitly.
This commit is contained in:
1 parent
097043db2a
commit
c23edd2acf
1 file changed
+1
-6
@@ -73,12 +73,7 @@ ZEND_API zval* zend_call_method(zend_object *object, zend_class_entry *obj_ce, z
|
||||
if (object) {
|
||||
called_scope = object->ce;
|
||||
} else {
|
||||
called_scope = zend_get_called_scope(EG(current_execute_data));
|
||||
if (obj_ce &&
|
||||
(!called_scope ||
|
||||
!instanceof_function(called_scope, obj_ce))) {
|
||||
called_scope = obj_ce;
|
||||
}
|
||||
called_scope = obj_ce;
|
||||
}
|
||||
|
||||
zend_call_known_function(fn, object, called_scope, retval_ptr, param_count, params);
|
||||
|
||||
Reference in new issue
Block a user