diff options
| author | Andrey Hristov <andrey@php.net> | 2012-10-31 15:55:04 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2012-10-31 15:55:04 +0100 |
| commit | f2f380407ac4138a483b43f9649695db36e42c8c (patch) | |
| tree | e7048592c57ca7c0822c2cbe47cbf9f9e86679ea /Zend/zend_compile.c | |
| parent | d62bc53a4fb2058a06f356b5779a0db88f6e207c (diff) | |
| parent | 8fb26e76ba463cfd38433bb2f19be84ff79b11b8 (diff) | |
| download | php-git-f2f380407ac4138a483b43f9649695db36e42c8c.tar.gz | |
Merge branch 'master' of ssh://git.php.net/php-src
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 0c03e4cf18..2d2c284b74 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3966,7 +3966,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args, /* if it is 0, no modifieres has been changed */ if (aliases[i]->modifiers) { - fn_copy.common.fn_flags = aliases[i]->modifiers; + fn_copy.common.fn_flags = aliases[i]->modifiers | ZEND_ACC_ALIAS; if (!(aliases[i]->modifiers & ZEND_ACC_PPP_MASK)) { fn_copy.common.fn_flags |= ZEND_ACC_PUBLIC; } @@ -4007,7 +4007,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args, && (!aliases[i]->trait_method->ce || fn->common.scope == aliases[i]->trait_method->ce) && (aliases[i]->trait_method->mname_len == fnname_len) && (zend_binary_strcasecmp(aliases[i]->trait_method->method_name, aliases[i]->trait_method->mname_len, fn->common.function_name, fnname_len) == 0)) { - fn_copy.common.fn_flags = aliases[i]->modifiers; + fn_copy.common.fn_flags = aliases[i]->modifiers | ZEND_ACC_ALIAS; if (!(aliases[i]->modifiers & ZEND_ACC_PPP_MASK)) { fn_copy.common.fn_flags |= ZEND_ACC_PUBLIC; |