From: Nikita Popov <nikic@php.net>
Date: Tue, 6 May 2014 18:32:49 +0000 (+0200)
Subject: Fix error message in parse_method_params
X-Git-Tag: POST_PHPNG_MERGE~393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccc2c8ae165b94765b8dfe62c0a1bab7dabb1e37;p=php

Fix error message in parse_method_params
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 3116078f9d..8fc21f1769 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);