Merge branch 'PHP-5.4' into PHP-5.5

laruence · laruence · commit e356d790cccc · 2013-08-29T14:02:34.000+08:00
diff --git 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 &&

Original file line number	Diff line number	Diff line change
`@@ -3980,7 +3980,7 @@ ZEND_API const char* zend_find_alias_name(zend_class_entry ce, const char name`
`3980`	`3980`	`{`
`3981`	`3981`	`zend_trait_alias alias, *alias_ptr;`
`3982`	`3982`
`3983`		`- if (alias_ptr = ce->trait_aliases) {`
	`3983`	`+ if ((alias_ptr = ce->trait_aliases)) {`
`3984`	`3984`	`alias = *alias_ptr;`
`3985`	`3985`	`while (alias) {`
`3986`	`3986`	`if (alias->alias_len == len &&`