diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-08-08 10:10:26 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-08-08 10:10:26 +0000 |
| commit | c022ca263b2aab0e80c0d6ee23e161b6e429abc5 (patch) | |
| tree | 26b733a4826da7d3689f5f96fc5b1b08b0ab76c9 | |
| parent | af688c3394c5d60ba1fd42d0638b2d9cf9ec36cd (diff) | |
| download | php-git-c022ca263b2aab0e80c0d6ee23e161b6e429abc5.tar.gz | |
%s -> %v
ce names are in Unicode
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index b5dabb3ef4..bace5032ab 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1790,7 +1790,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, ANY, CONST|TMP|VAR|UNUSED|CV) zend_error_noreturn(E_ERROR, "Can not call constructor"); } if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) { - zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name); + zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name); } EX(fbc) = ce->constructor; } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index f2240949ad..a5be1cd458 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -681,7 +681,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A zend_error_noreturn(E_ERROR, "Can not call constructor"); } if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) { - zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name); + zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name); } EX(fbc) = ce->constructor; } @@ -902,7 +902,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_error_noreturn(E_ERROR, "Can not call constructor"); } if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) { - zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name); + zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name); } EX(fbc) = ce->constructor; } @@ -1038,7 +1038,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_error_noreturn(E_ERROR, "Can not call constructor"); } if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) { - zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name); + zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name); } EX(fbc) = ce->constructor; } @@ -1173,7 +1173,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ zend_error_noreturn(E_ERROR, "Can not call constructor"); } if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) { - zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name); + zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name); } EX(fbc) = ce->constructor; } @@ -1266,7 +1266,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS zend_error_noreturn(E_ERROR, "Can not call constructor"); } if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) { - zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name); + zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name); } EX(fbc) = ce->constructor; } |