diff options
| author | Xinchen Hui <laruence@php.net> | 2013-08-29 14:02:34 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-08-29 14:02:34 +0800 |
| commit | e356d790cccc309acf870dc22be7d00edaed8261 (patch) | |
| tree | 7a4f07ba3d3f20a6205c433fb5eeca05233c79e6 | |
| parent | f0cb67402f2bcd3dc310cf938dfce799ccec7c7b (diff) | |
| parent | 747daa53546bfa2c4a0fd88d2d3dffd30356c1ad (diff) | |
| download | php-git-e356d790cccc309acf870dc22be7d00edaed8261.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | Zend/zend_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 498ed6eeb4..7fd3a8adbb 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3980,7 +3980,7 @@ ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name { zend_trait_alias *alias, **alias_ptr; - if (alias_ptr = ce->trait_aliases) { + if ((alias_ptr = ce->trait_aliases)) { alias = *alias_ptr; while (alias) { if (alias->alias_len == len && |