cvs: ZendEngine2(PHP_5_3) / zend_execute_API.c
"Felipe Pena" <[email protected]>
| Newsgroups | gmane.comp.php.cvs.zend |
|---|---|
| Message-ID | <cvsfelipe1212691830@cvsserver> |
felipe Thu Jun 5 18:50:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_execute_API.c
Log:
- Fixed bug #45180 ('class::method' works differently than array('class', 'method'))
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.41&r2=1.331.2.20.2.24.2.42&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.41 ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.42
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.41 Tue Jun 3 18:11:11 2008
+++ ZendEngine2/zend_execute_API.c Thu Jun 5 18:50:29 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.41 2008/06/03 18:11:11 felipe Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.42 2008/06/05 18:50:29 felipe Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -907,6 +907,10 @@
EX(function_state).function = zend_std_get_static_method(calling_scope, 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)
&& !instanceof_function(check_scope_or_static, calling_scope TSRMLS_CC)) {
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php