Update to MediaWiki 1.24.1

1 files changed, 143 insertions, 0 deletions

diff --git a/includes/revisiondelete/RevDelRevisionList.php b/includes/revisiondelete/RevDelRevisionList.php
new file mode 100644
index 00000000..25450725
--- /dev/null
+++ b/includes/revisiondelete/RevDelRevisionList.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * 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
+ * @ingroup RevisionDelete
+ */
+
+/**
+ * List for revision table items
+ *
+ * This will check both the 'revision' table for live revisions and the
+ * 'archive' table for traditionally-deleted revisions that have an
+ * ar_rev_id saved.
+ *
+ * See RevDelRevisionItem and RevDelArchivedRevisionItem for items.
+ */
+class RevDelRevisionList extends RevDelList {
+	/** @var int */
+	public $currentRevId;
+
+	public function getType() {
+		return 'revision';
+	}
+
+	public static function getRelationType() {
+		return 'rev_id';
+	}
+
+	public static function getRestriction() {
+		return 'deleterevision';
+	}
+
+	public static function getRevdelConstant() {
+		return Revision::DELETED_TEXT;
+	}
+
+	public static function suggestTarget( $target, array $ids ) {
+		$rev = Revision::newFromId( $ids[0] );
+		return $rev ? $rev->getTitle() : $target;
+	}
+
+	/**
+	 * @param DatabaseBase $db
+	 * @return mixed
+	 */
+	public function doQuery( $db ) {
+		$ids = array_map( 'intval', $this->ids );
+		$live = $db->select(
+			array( 'revision', 'page', 'user' ),
+			array_merge( Revision::selectFields(), Revision::selectUserFields() ),
+			array(
+				'rev_page' => $this->title->getArticleID(),
+				'rev_id' => $ids,
+			),
+			__METHOD__,
+			array( 'ORDER BY' => 'rev_id DESC' ),
+			array(
+				'page' => Revision::pageJoinCond(),
+				'user' => Revision::userJoinCond() )
+		);
+
+		if ( $live->numRows() >= count( $ids ) ) {
+			// All requested revisions are live, keeps things simple!
+			return $live;
+		}
+
+		// Check if any requested revisions are available fully deleted.
+		$archived = $db->select( array( 'archive' ), Revision::selectArchiveFields(),
+			array(
+				'ar_rev_id' => $ids
+			),
+			__METHOD__,
+			array( 'ORDER BY' => 'ar_rev_id DESC' )
+		);
+
+		if ( $archived->numRows() == 0 ) {
+			return $live;
+		} elseif ( $live->numRows() == 0 ) {
+			return $archived;
+		} else {
+			// Combine the two! Whee
+			$rows = array();
+			foreach ( $live as $row ) {
+				$rows[$row->rev_id] = $row;
+			}
+			foreach ( $archived as $row ) {
+				$rows[$row->ar_rev_id] = $row;
+			}
+			krsort( $rows );
+			return new FakeResultWrapper( array_values( $rows ) );
+		}
+	}
+
+	public function newItem( $row ) {
+		if ( isset( $row->rev_id ) ) {
+			return new RevDelRevisionItem( $this, $row );
+		} elseif ( isset( $row->ar_rev_id ) ) {
+			return new RevDelArchivedRevisionItem( $this, $row );
+		} else {
+			// This shouldn't happen. :)
+			throw new MWException( 'Invalid row type in RevDelRevisionList' );
+		}
+	}
+
+	public function getCurrent() {
+		if ( is_null( $this->currentRevId ) ) {
+			$dbw = wfGetDB( DB_MASTER );
+			$this->currentRevId = $dbw->selectField(
+				'page', 'page_latest', $this->title->pageCond(), __METHOD__ );
+		}
+		return $this->currentRevId;
+	}
+
+	public function getSuppressBit() {
+		return Revision::DELETED_RESTRICTED;
+	}
+
+	public function doPreCommitUpdates() {
+		$this->title->invalidateCache();
+		return Status::newGood();
+	}
+
+	public function doPostCommitUpdates() {
+		$this->title->purgeSquid();
+		// Extensions that require referencing previous revisions may need this
+		wfRunHooks( 'ArticleRevisionVisibilitySet', array( &$this->title ) );
+		return Status::newGood();
+	}
+}