com php-src: Fix error message in parse_method_params: Zend/zend_API.c
| From: | Nikita Popov | Date: | Tue, 06 May 2014 18:32:49 +0000 |
| Subject: | com php-src: Fix error message in parse_method_params: Zend/zend_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78153@lists.php.net to get a copy of this message | ||
Commit: ccc2c8ae165b94765b8dfe62c0a1bab7dabb1e37
Author: Nikita Popov <nikic@php.net> Tue, 6 May 2014 20:32:49 +0200
Parents: 80f8d20b7258395dbc85f62cc20ee043df9bacc2
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ccc2c8ae165b94765b8dfe62c0a1bab7dabb1e37
Log:
Fix error message in parse_method_params
Changed paths:
M Zend/zend_API.c
Diff:
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 3116078..8fc21f1 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1030,7 +1030,7 @@ ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval
*this_ptr
if (ce && !instanceof_function(Z_OBJCE_P(this_ptr), ce TSRMLS_CC)) {
zend_error(E_CORE_ERROR, "%s::%s() must be derived from %s::%s",
- ce->name->val, get_active_function_name(TSRMLS_C), Z_OBJCE_P(this_ptr)->name->val,
get_active_function_name(TSRMLS_C));
+ Z_OBJCE_P(this_ptr)->name->val, get_active_function_name(TSRMLS_C), ce->name->val,
get_active_function_name(TSRMLS_C));
}
retval = zend_parse_va_args(num_args, p, &va, 0 TSRMLS_CC);