diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-29 05:40:23 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-29 05:40:23 -0700 |
| commit | 5bff1286b626aff4ebadf74dd55e111a580da90e (patch) | |
| tree | 56dd613af044ab9ef6f39ed02cb464fbb36e3f79 /Zend/zend_builtin_functions.c | |
| parent | 1fdcc705a4bc3a9d42a32c5f1ee1ce6b5d3ce428 (diff) | |
| parent | dfc6feb6e84f27094e6a2e3947caa094f7c35d26 (diff) | |
| download | php-git-5bff1286b626aff4ebadf74dd55e111a580da90e.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 72d905848a..04f4ebec26 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1399,15 +1399,8 @@ ZEND_FUNCTION(class_alias) return; } - if (!autoload) { - lc_name = do_alloca(class_name_len + 1, use_heap); - zend_str_tolower_copy(lc_name, class_name, class_name_len); + found = zend_lookup_class_ex(class_name, class_name_len, NULL, autoload, &ce TSRMLS_CC); - found = zend_hash_find(EG(class_table), lc_name, class_name_len+1, (void **) &ce); - free_alloca(lc_name, use_heap); - } else { - found = zend_lookup_class(class_name, class_name_len, &ce TSRMLS_CC); - } if (found == SUCCESS) { if ((*ce)->type == ZEND_USER_CLASS) { if (zend_register_class_alias_ex(alias_name, alias_name_len, *ce TSRMLS_CC) == SUCCESS) { |