Merge "Make $wgExperimentalHtmlIds fall back on modern HTML5 mode"

[lhc/web/wiklou.git] / includes / libs / HashRing.php

diff --git a/includes/libs/HashRing.php b/includes/libs/HashRing.php
index be40965..f61c139 100644 (file)
--- a/includes/libs/HashRing.php
+++ b/includes/libs/HashRing.php
@@ -116,11 +116,12 @@ class HashRing {
                // If more locations are requested, wrap-around and keep adding them
                reset( $this->ring );
                while ( count( $locations ) < $limit ) {
-                       list( $location, ) = each( $this->ring );
+                       $location = key( $this->ring );
                        if ( $location === $primaryLocation ) {
                                break; // don't go in circles
                        }
                        $locations[] = $location;
+                       next( $this->ring );
                }
 
                return $locations;