diff options
| author | Marcus Boerger <helly@php.net> | 2004-08-02 08:27:57 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-08-02 08:27:57 +0000 |
| commit | 5f0433db83663968d20c8ab02b875aad309c544d (patch) | |
| tree | 264bfc076e268e6dfd3379e361c0380c9480b314 /Zend/zend_execute_API.c | |
| parent | 58901970240e7a9ccc0ecf9510d96bb8f7dcac59 (diff) | |
| download | php-git-5f0433db83663968d20c8ab02b875aad309c544d.tar.gz | |
MFB: Enforce protocol on magic methods/functions
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index ff540a0965..47c5365e90 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -923,7 +923,7 @@ ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry *** return FAILURE; } - ZVAL_STRINGL(&autoload_function, "__autoload", sizeof("__autoload")-1, 0); + ZVAL_STRINGL(&autoload_function, ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME)-1, 0); INIT_PZVAL(class_name_ptr); ZVAL_STRINGL(class_name_ptr, name, name_length, 0); @@ -944,7 +944,7 @@ ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry *** if (EG(exception)) { free_alloca(lc_name); - zend_error(E_ERROR, "__autoload(%s) threw an exception of type '%s'", name, Z_OBJCE_P(EG(exception))->name); + zend_error(E_ERROR, "Function %s(%s) threw an exception of type '%s'", ZEND_AUTOLOAD_FUNC_NAME, name, Z_OBJCE_P(EG(exception))->name); return FAILURE; } EG(exception) = exception; |