com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/reflectio n/php_reflection.c
| From: | Xinchen Hui | Date: | Wed, 01 Aug 2012 12:24:14 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/reflectio n/php_reflection.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69746@lists.php.net to get a copy of this message | ||
Commit: 2026e9040ff3093e53083baefc1299b1efa25c4c
Author: Xinchen Hui <laruence@php.net> Wed, 1 Aug 2012 20:24:14 +0800
Parents: ff729aabf7a3dd7bd76b50dcaf7051e414f3714c 10642aa9e4f1eb694a8f7b514cc234cb24545744
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2026e9040ff3093e53083baefc1299b1efa25c4c
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM ext/reflection/php_reflection.c
Diff:
diff --cc ext/reflection/php_reflection.c
index bcdcdae,23c9044..7e80dea
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@@ -2568,11 -2379,9 +2568,9 @@@ ZEND_METHOD(reflection_parameter, isDef
{
RETURN_FALSE;
}
- if (param->offset < param->required) {
- RETURN_FALSE;
- }
+
precv = _get_recv_op((zend_op_array*)param->fptr, param->offset);
- if (!precv || precv->opcode != ZEND_RECV_INIT || precv->op2.op_type == IS_UNUSED) {
+ if (!precv || precv->opcode != ZEND_RECV_INIT || precv->op2_type == IS_UNUSED) {
RETURN_FALSE;
}
RETURN_TRUE;