From: Felipe Pena <felipe@php.net>
Date: Thu, 5 Jun 2008 19:14:25 +0000 (+0000)
Subject: - MFB: Fixed bug #45180 ('class::method' works differently than array('class', 'method'))
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1590
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e74a12ae1f92784429b1c54dfaafe891753e3d7;p=php

- MFB: Fixed bug #45180 ('class::method' works differently than array('class', 'method'))
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 00cc88743b..b33f63857a 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1001,6 +1001,10 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
 				} else {
 					EX(function_state).function = zend_std_get_static_method(calling_scope, Z_TYPE_P(fci->function_name), fname, fname_len TSRMLS_CC);
 				}
+				
+				if (((zend_internal_function*)EX(function_state).function)->handler == zend_std_call_user_call)  {
+					fci->object_pp = &EG(This);
+				}
 
 				if (check_scope_or_static && EX(function_state).function
 				&& !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC)