diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2004-04-01 22:07:42 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2004-04-01 22:07:42 +0000 |
| commit | c85843aec1177c8ff9932c282b5a49876f958ac3 (patch) | |
| tree | 93882c50d3956e1b8104a54a54789052937a2ff4 | |
| parent | 962c8cc9ef964c80dad21060af327d53113dd714 (diff) | |
| download | php-git-c85843aec1177c8ff9932c282b5a49876f958ac3.tar.gz | |
MFB: Revert patch for bug #27782.
| -rw-r--r-- | Zend/zend_builtin_functions.c | 3 | ||||
| -rw-r--r-- | ext/standard/array.c | 8 | ||||
| -rw-r--r-- | ext/standard/tests/array/bug27782.phpt | 32 |
3 files changed, 0 insertions, 43 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index d15e6fb55a..42a82754dc 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -368,9 +368,6 @@ ZEND_FUNCTION(each) return; } if (zend_hash_get_current_data(target_hash, (void **) &entry_ptr)==FAILURE) { - if (!target_hash->pInternalPointer) { - zend_hash_internal_pointer_end(target_hash); - } RETURN_FALSE; } array_init(return_value); diff --git a/ext/standard/array.c b/ext/standard/array.c index 831357e533..539848322e 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -740,10 +740,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) { @@ -772,10 +768,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 |