Update to MediaWiki 1.24.1

1 files changed, 90 insertions, 0 deletions

diff --git a/includes/UserArrayFromResult.php b/includes/UserArrayFromResult.php
new file mode 100644
index 00000000..fb533d08
--- /dev/null
+++ b/includes/UserArrayFromResult.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Class to walk into a list of User objects.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+class UserArrayFromResult extends UserArray implements Countable {
+	/** @var ResultWrapper */
+	public $res;
+
+	/** @var int */
+	public $key;
+
+	/** @var bool|stdClass */
+	public $current;
+
+	/**
+	 * @param ResultWrapper $res
+	 */
+	function __construct( $res ) {
+		$this->res = $res;
+		$this->key = 0;
+		$this->setCurrent( $this->res->current() );
+	}
+
+	/**
+	 * @param bool|stdClass $row
+	 * @return void
+	 */
+	protected function setCurrent( $row ) {
+		if ( $row === false ) {
+			$this->current = false;
+		} else {
+			$this->current = User::newFromRow( $row );
+		}
+	}
+
+	/**
+	 * @return int
+	 */
+	public function count() {
+		return $this->res->numRows();
+	}
+
+	/**
+	 * @return User
+	 */
+	function current() {
+		return $this->current;
+	}
+
+	function key() {
+		return $this->key;
+	}
+
+	function next() {
+		$row = $this->res->next();
+		$this->setCurrent( $row );
+		$this->key++;
+	}
+
+	function rewind() {
+		$this->res->rewind();
+		$this->key = 0;
+		$this->setCurrent( $this->res->current() );
+	}
+
+	/**
+	 * @return bool
+	 */
+	function valid() {
+		return $this->current !== false;
+	}
+}