Fixed error messages

This commit is contained in:
Dmitry Stogov 2014-02-22 00:41:06 +04:00
parent bc3fb147cf
commit 2711e368b8

View file

@ -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);
}
}
}