From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 includes/HistoryPage.php | 50 +++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 20 deletions(-)

(limited to 'includes/HistoryPage.php')

diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php
index b2cf044a..dd5ecd43 100644
--- a/includes/HistoryPage.php
+++ b/includes/HistoryPage.php
@@ -326,6 +326,10 @@ class HistoryPager extends ReverseChronologicalPager {
 		return $this->historyPage->getArticle();
 	}
 
+	function getTitle() {
+		return $this->title;
+	}
+
 	function getSqlComment() {
 		if ( $this->conds ) {
 			return 'history page filtered'; // potentially slow, see CR r58153
@@ -339,7 +343,7 @@ class HistoryPager extends ReverseChronologicalPager {
 			'tables'  => array( 'revision' ),
 			'fields'  => Revision::selectFields(),
 			'conds'   => array_merge(
-				array( 'rev_page' => $this->historyPage->getTitle()->getArticleID() ),
+				array( 'rev_page' => $this->title->getArticleID() ),
 				$this->conds ),
 			'options' => array( 'USE INDEX' => array( 'revision' => 'page_timestamp' ) ),
 			'join_conds' => array( 'tag_summary' => array( 'LEFT JOIN', 'ts_rev_id=rev_id' ) ),
@@ -380,7 +384,7 @@ class HistoryPager extends ReverseChronologicalPager {
 	 * @return string HTML output
 	 */
 	function getStartBody() {
-		global $wgScript, $wgUser, $wgOut, $wgContLang;
+		global $wgScript, $wgUser, $wgOut;
 		$this->lastRow = false;
 		$this->counter = 1;
 		$this->oldIdChecked = 0;
@@ -397,31 +401,33 @@ class HistoryPager extends ReverseChronologicalPager {
 		$this->buttons = '<div>';
 		$this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions' ),
 			array( 'class' => 'historysubmit' )
-				+ $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'compareselectedversions' )
+				+ Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' )
 		) . "\n";
 
 		if ( $wgUser->isAllowed( 'deleterevision' ) ) {
-			$this->preventClickjacking();
-			$float = $wgContLang->alignEnd();
-			# Note bug #20966, <button> is non-standard in IE<8
-			$element = Html::element( 'button',
-				array(
-					'type' => 'submit',
-					'name' => 'revisiondelete',
-					'value' => '1',
-					'style' => "float: $float;",
-					'class' => 'mw-history-revisiondelete-button',
-				),
-				wfMsg( 'showhideselectedversions' )
-			) . "\n";
-			$s .= $element;
-			$this->buttons .= $element;
+			$s .= $this->getRevisionButton( 'revisiondelete', 'showhideselectedversions' );
 		}
 		$this->buttons .= '</div>';
 		$s .= '</div><ul id="pagehistory">' . "\n";
 		return $s;
 	}
 
+	private function getRevisionButton( $name, $msg ) {
+		$this->preventClickjacking();
+		# Note bug #20966, <button> is non-standard in IE<8
+		$element = Html::element( 'button',
+			array(
+				'type' => 'submit',
+				'name' => $name,
+				'value' => '1',
+				'class' => "mw-history-$name-button",
+			),
+			wfMsg( $msg )
+		) . "\n";
+		$this->buttons .= $element;
+		return $element;
+	}
+
 	function getEndBody() {
 		if ( $this->lastRow ) {
 			$latest = $this->counter == 1 && $this->mIsFirst;
@@ -513,7 +519,7 @@ class HistoryPager extends ReverseChronologicalPager {
 					array( 'name' => 'ids[' . $rev->getId() . ']' ) );
 			}
 		// User can only view deleted revisions...
-		} else if ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) {
+		} elseif ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) {
 			// If revision was hidden from sysops, disable the link
 			if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
 				$cdel = $this->getSkin()->revDeleteLinkDisabled( false );
@@ -529,9 +535,13 @@ class HistoryPager extends ReverseChronologicalPager {
 			$s .= " $del ";
 		}
 
+		$dirmark = $wgLang->getDirMark();
+
 		$s .= " $link";
+		$s .= $dirmark;
 		$s .= " <span class='history-user'>" .
 			$this->getSkin()->revUserTools( $rev, true ) . "</span>";
+		$s .= $dirmark;
 
 		if ( $rev->isMinor() ) {
 			$s .= ' ' . ChangesList::flag( 'minor' );
@@ -721,7 +731,7 @@ class HistoryPager extends ReverseChronologicalPager {
 				if ( !$rev->userCan( Revision::DELETED_TEXT ) ) {
 					$radio['disabled'] = 'disabled';
 					$checkmark = array(); // We will check the next possible one
-				} else if ( !$this->oldIdChecked ) {
+				} elseif ( !$this->oldIdChecked ) {
 					$checkmark = array( 'checked' => 'checked' );
 					$this->oldIdChecked = $id;
 				} else {
-- 
cgit v1.2.3-54-g00ecf