Merge branch 'PHP-5.4'

This commit is contained in:
Xinchen Hui 2012-08-23 16:13:57 +08:00
commit 3ef3b80cdd

View file

@ -3838,9 +3838,9 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
/* one more thing: make sure we properly implement an abstract method */ /* one more thing: make sure we properly implement an abstract method */
if (existing_fn && existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) { if (existing_fn && existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
prototype = fn->common.prototype; prototype = fn->common.prototype;
do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC); do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
fn->common.prototype = prototype; fn->common.prototype = prototype;
} }
/* delete inherited fn if the function to be added is not abstract */ /* delete inherited fn if the function to be added is not abstract */