diff options
| author | Christopher Jones <sixd@php.net> | 2013-07-25 08:53:26 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-07-25 08:53:26 -0700 |
| commit | 979194351d0e29a7560d0224c20f4b9f85dd5777 (patch) | |
| tree | 70ac445c704dfddb5c003e2c7042db97eb224de6 /ext/spl/spl_array.c | |
| parent | a1bf38e075ce7d6bbcbcf570444f13ea7558fa41 (diff) | |
| parent | 515092917d8c31ea4fb2d80598dd672511717e4e (diff) | |
| download | php-git-979194351d0e29a7560d0224c20f4b9f85dd5777.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Xinchen Hui (2) and others
# Via Stanislav Malyshev (1) and Xinchen Hui (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Upper section name
Fixed bug #65328 (Segfault when getting SplStack object Value)
Fix compiler warning on redefined constant
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Diffstat (limited to 'ext/spl/spl_array.c')
| -rw-r--r-- | ext/spl/spl_array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 40fbb4c8f6..0bfb65890c 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1658,7 +1658,7 @@ SPL_METHOD(Array, getChildren) return; } if (instanceof_function(Z_OBJCE_PP(entry), Z_OBJCE_P(getThis()) TSRMLS_CC)) { - RETURN_ZVAL(*entry, 0, 0); + RETURN_ZVAL(*entry, 1, 0); } } |