com php-src: Fixed error messages: Zend/zend_object_handler s.c
| From: | Dmitry Stogov | Date: | Fri, 21 Feb 2014 20:41:06 +0000 |
| Subject: | com php-src: Fixed error messages: Zend/zend_object_handler s.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77999@lists.php.net to get a copy of this message | ||
Commit: 2711e368b83c98eb506e09f498d87ec49ff5e36a
Author: Dmitry Stogov <dmitry@zend.com> Sat, 22 Feb 2014 00:41:06 +0400
Parents: bc3fb147cfe58510210ac94e8726e7c7a74f4572
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2711e368b83c98eb506e09f498d87ec49ff5e36a
Log:
Fixed error messages
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index bdb1887..33bd74e 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1308,9 +1308,9 @@ ZEND_API union _zend_function *zend_std_get_constructor(zval *object
TSRMLS_DC)
*/
if (UNEXPECTED(constructor->common.scope != EG(scope))) {
if (EG(scope)) {
- zend_error_noreturn(E_ERROR, "Call to private %s::%s() from context '%s'",
constructor->common.scope->name, constructor->common.function_name, EG(scope)->name);
+ zend_error_noreturn(E_ERROR, "Call to private %s::%s() from context '%s'",
constructor->common.scope->name->val, constructor->common.function_name->val,
EG(scope)->name->val);
} else {
- zend_error_noreturn(E_ERROR, "Call to private %s::%s() from invalid context",
constructor->common.scope->name, constructor->common.function_name);
+ zend_error_noreturn(E_ERROR, "Call to private %s::%s() from invalid context",
constructor->common.scope->name->val, constructor->common.function_name->val);
}
}
} else if ((constructor->common.fn_flags & ZEND_ACC_PROTECTED)) {
@@ -1320,9 +1320,9 @@ ZEND_API union _zend_function *zend_std_get_constructor(zval *object
TSRMLS_DC)
*/
if (UNEXPECTED(!zend_check_protected(zend_get_function_root_class(constructor), EG(scope)))) {
if (EG(scope)) {
- zend_error_noreturn(E_ERROR, "Call to protected %s::%s() from context
'%s'", constructor->common.scope->name, constructor->common.function_name,
EG(scope)->name);
+ zend_error_noreturn(E_ERROR, "Call to protected %s::%s() from context
'%s'", constructor->common.scope->name->val,
constructor->common.function_name->val, EG(scope)->name->val);
} else {
- zend_error_noreturn(E_ERROR, "Call to protected %s::%s() from invalid context",
constructor->common.scope->name, constructor->common.function_name);
+ zend_error_noreturn(E_ERROR, "Call to protected %s::%s() from invalid context",
constructor->common.scope->name->val, constructor->common.function_name->val);
}
}
}