cvs: ZendEngine2 / zend_execute_API.c

felipe		Thu Jun  5 19:14:25 2008 UTC

  Modified files:              
    /ZendEngine2	zend_execute_API.c 
  Log:
  - MFB: Fixed bug #45180 ('class::method' works differently than array('class', 'method'))
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.449&r2=1.450&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.449 ZendEngine2/zend_execute_API.c:1.450
--- ZendEngine2/zend_execute_API.c:1.449	Tue Jun  3 19:01:25 2008
+++ ZendEngine2/zend_execute_API.c	Thu Jun  5 19:14:25 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.449 2008/06/03 19:01:25 felipe Exp $ */
+/* $Id: zend_execute_API.c,v 1.450 2008/06/05 19:14:25 felipe Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -1001,6 +1001,10 @@
 				} 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)



-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php