]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Wed, 1 Aug 2012 12:24:14 +0000 (20:24 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 1 Aug 2012 12:24:14 +0000 (20:24 +0800)
1  2 
ext/reflection/php_reflection.c

index bcdcdaeea3aba34a8083bb62c6eda69ff3c3eab5,23c90449811cd1a9c860b115456b64946c2823a9..7e80deaac60afa7e3b8c10b05dfd9ab267ca17a5
@@@ -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;