Fix typo while resolving conflicts

This commit is contained in:
Xinchen Hui 2012-05-23 13:43:49 +08:00
parent a7df6ce664
commit f733173b1f

View File

@ -2413,7 +2413,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
return;
}
precv = _get_recv_op((zend_op_array*)param->fptr, param->offset);
if (!precv || precv->opcode != ZEND_RECV_INIT || precv->op2_type == IS_UNUSED) {
if (!precv || precv->opcode != ZEND_RECV_INIT || precv->op2.op_type == IS_UNUSED) {
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Internal error");
return;
}