Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

weltling · weltling · commit fa7f215d19b3 · 2012-03-28T14:51:16.000+02:00
* 'PHP-5.4' of git.php.net:php-src: Fixed problem introduced in a763929 (fixing bug #61347).
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
@@ -659,7 +659,7 @@ SPL_METHOD(Array, offsetExists)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &index) == FAILURE) {
 		return;
 	}
-	RETURN_BOOL(spl_array_has_dimension_ex(0, getThis(), index, 0 TSRMLS_CC));
+	RETURN_BOOL(spl_array_has_dimension_ex(0, getThis(), index, 2 TSRMLS_CC));
 } /* }}} */
 
 /* {{{ proto mixed ArrayObject::offsetGet(mixed $index)

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ SPL_METHOD(Array, offsetExists)`
`659`	`659`	`if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &index) == FAILURE) {`
`660`	`660`	`return;`
`661`	`661`	`}`
`662`		`- RETURN_BOOL(spl_array_has_dimension_ex(0, getThis(), index, 0 TSRMLS_CC));`
	`662`	`+ RETURN_BOOL(spl_array_has_dimension_ex(0, getThis(), index, 2 TSRMLS_CC));`
`663`	`663`	`} /* }}} */`
`664`	`664`
`665`	`665`	`/* {{{ proto mixed ArrayObject::offsetGet(mixed $index)`