summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-03-28 14:51:16 +0200
committerAnatoliy Belsky <ab@php.net>2012-03-28 14:51:16 +0200
commitfa7f215d19b3546c028b2cfb9864d28a06ac29af (patch)
tree506cf6eaf70f3df3e4d7311d32064dc5d907ae55
parent105a9a9d455a29951add13f5add9e0b59520f79e (diff)
parenta9121819d012faa2a2c57e05eddc7a511ca520f7 (diff)
downloadphp-git-fa7f215d19b3546c028b2cfb9864d28a06ac29af.tar.gz
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: Fixed problem introduced in a763929 (fixing bug #61347).
-rwxr-xr-xext/spl/spl_array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 811a30b3d4..e448731a52 100755
--- 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)