diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2004-04-01 19:07:02 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2004-04-01 19:07:02 +0000 |
| commit | 4de55b50dc69498a77558dc78306b46c2ccfceeb (patch) | |
| tree | 03047007af88b6ff0e3961dd3e8ab3c420923a55 | |
| parent | bbdbfa8563879dae9575ed090ac462cd11e38cba (diff) | |
| download | php-git-4de55b50dc69498a77558dc78306b46c2ccfceeb.tar.gz | |
Revert patch for bug #27782.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/standard/array.c | 8 | ||||
| -rw-r--r-- | ext/standard/tests/array/bug27782.phpt | 32 |
3 files changed, 0 insertions, 41 deletions
@@ -8,7 +8,6 @@ PHP 4 NEWS - Fixed bug #27809 (ftp_systype returns null on some ftp servers). (Ilia) - Fixed bug #27802 (default number of children to 8 when PHP_FCGI_CHILDREN is not defined). (Ilia) -- Fixed bug #27782 (Wrong behaviour of next(), prev() and each()). (Ilia) - Fixed bug #27764 (Get return value from a stored procedure not returning any result sets). (Frank) - Fixed bug #27762 (SCO Openserver doesn't have S_ISSOCK). (Wez) diff --git a/ext/standard/array.c b/ext/standard/array.c index 5a6923ece9..7052c35778 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -718,10 +718,6 @@ PHP_FUNCTION(prev) RETURN_FALSE; } zend_hash_move_backwards(target_hash); - if (!target_hash->pInternalPointer) { - zend_hash_internal_pointer_reset(target_hash); - RETURN_FALSE; - } if (return_value_used) { if (zend_hash_get_current_data(target_hash, (void **) &entry) == FAILURE) { @@ -750,10 +746,6 @@ PHP_FUNCTION(next) RETURN_FALSE; } zend_hash_move_forward(target_hash); - if (!target_hash->pInternalPointer) { - zend_hash_internal_pointer_end(target_hash); - RETURN_FALSE; - } if (return_value_used) { if (zend_hash_get_current_data(target_hash, (void **) &entry) == FAILURE) { diff --git a/ext/standard/tests/array/bug27782.phpt b/ext/standard/tests/array/bug27782.phpt deleted file mode 100644 index 2c8c6753d4..0000000000 --- a/ext/standard/tests/array/bug27782.phpt +++ /dev/null @@ -1,32 +0,0 @@ ---TEST-- -Bug #27782 (each(), next(), prev() mange array position) ---FILE-- -<?php -$a = array("a", "b", "c"); -reset($a); - -while (next($a) !== false); - -echo current($a) . "\n"; -echo prev($a) . "\n"; - -reset($a); - -while (list(,$foo) = each($a)) { - echo $foo . "\n"; -} -echo current($a) . "\n"; - -while ($foo = prev($a)) { - echo $foo . "\n"; -} -?> ---EXPECT-- -c -b -a -b -c -c -b -a |