]> granicus.if.org Git - php/commitdiff
Fixed error messages
authorDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 20:41:06 +0000 (00:41 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 20:41:06 +0000 (00:41 +0400)
Zend/zend_object_handlers.c

index bdb18879d7f2b3ba54b360cf4e868b4d4d735ddd..33bd74ef7f51f12c48bf7d509f92770f42fc1eef 100644 (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);
                                }
                        }
                }