diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-10-27 14:59:09 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-10-27 14:59:09 +0300 |
| commit | 8203a0668d1ec4d667336f8f3be469873d740911 (patch) | |
| tree | aff15fec48100625df5be1d87440f8f197a5ed97 /Zend/zend_builtin_functions.c | |
| parent | 49ea143bbd8d0bfcd393d0b5308a5d7833fc087c (diff) | |
| parent | cf67a421e986b1020dd390a694185039b131ba7c (diff) | |
| download | php-git-8203a0668d1ec4d667336f8f3be469873d740911.tar.gz | |
Merge branch 'master' into rc_debug
* master:
Use per-request heap instead of system one
Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases
Makrk persistent resources and references with GC_PERSISTENT flag
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 387e9f5e60..0d6cc442b6 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1529,7 +1529,7 @@ ZEND_FUNCTION(class_alias) if (ce) { if (ce->type == ZEND_USER_CLASS) { - if (zend_register_class_alias_ex(alias_name, alias_name_len, ce) == SUCCESS) { + if (zend_register_class_alias_ex(alias_name, alias_name_len, ce, 0) == SUCCESS) { RETURN_TRUE; } else { zend_error(E_WARNING, "Cannot declare %s %s, because the name is already in use", zend_get_object_type(ce), alias_name); |