From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 12 Aug 2013 09:28:15 +0200
Subject: Update to MediaWiki 1.21.1

---
 includes/libs/GenericArrayObject.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'includes/libs/GenericArrayObject.php')

diff --git a/includes/libs/GenericArrayObject.php b/includes/libs/GenericArrayObject.php
index b4b9d610..d77d8ad6 100644
--- a/includes/libs/GenericArrayObject.php
+++ b/includes/libs/GenericArrayObject.php
@@ -28,9 +28,8 @@
  * @since 1.20
  *
  * @file
- * @ingroup Diff
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
 abstract class GenericArrayObject extends ArrayObject {
@@ -42,7 +41,7 @@ abstract class GenericArrayObject extends ArrayObject {
 	 *
 	 * @return string
 	 */
-	public abstract function getObjectType();
+	abstract public function getObjectType();
 
 	/**
 	 * @see SiteList::getNewOffset()
@@ -61,13 +60,11 @@ abstract class GenericArrayObject extends ArrayObject {
 	 * @return integer
 	 */
 	protected function getNewOffset() {
-		while ( true ) {
-			if ( !$this->offsetExists( $this->indexOffset ) ) {
-				return $this->indexOffset;
-			}
-
+		while ( $this->offsetExists( $this->indexOffset ) ) {
 			$this->indexOffset++;
 		}
+
+		return $this->indexOffset;
 	}
 
 	/**
@@ -194,7 +191,7 @@ abstract class GenericArrayObject extends ArrayObject {
 	/**
 	 * Returns an array holding all the data that should go into serialization calls.
 	 * This is intended to allow overloading without having to reimplement the
-	 * behaviour of this base class.
+	 * behavior of this base class.
 	 *
 	 * @since 1.20
 	 *
-- 
cgit v1.2.2