From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 25 Jan 2009 00:33:25 +0000 (+0000)
Subject: * redirect=no and mw-redirect classes to redirect pages (bug 17106)
X-Git-Tag: 1.31.0-rc.0~43263
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=ce271ac8e0a416b77fd72c79f71dc8276e2459ba;p=lhc%2Fweb%2Fwiklou.git

* redirect=no and mw-redirect classes to redirect pages (bug 17106)
* Don't show rollback links on new pages
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 2d2cd3c394..f85815fa2e 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -396,9 +396,9 @@ class ContribsPager extends ReverseChronologicalPager {
 		$queryInfo = array(
 			'tables' => $tables,
 			'fields' => array(
-				'page_namespace', 'page_title', 'page_is_new', 'page_latest', 'rev_id', 'rev_page',
-				'rev_text_id', 'rev_timestamp', 'rev_comment', 'rev_minor_edit', 'rev_user',
-				'rev_user_text', 'rev_parent_id', 'rev_deleted'
+				'page_namespace', 'page_title', 'page_is_new', 'page_latest', 'page_is_redirect',
+				'rev_id', 'rev_page','rev_text_id', 'rev_timestamp', 'rev_comment', 'rev_minor_edit', 
+				'rev_user', 'rev_user_text', 'rev_parent_id', 'rev_deleted'
 			),
 			'conds' => $conds,
 			'options' => array( 'USE INDEX' => array('revision' => $index) ),
@@ -458,36 +458,36 @@ class ContribsPager extends ReverseChronologicalPager {
 	 * @todo This would probably look a lot nicer in a table.
 	 */
 	function formatRow( $row ) {
-		wfProfileIn( __METHOD__ );
-
 		global $wgLang, $wgUser, $wgContLang;
+		wfProfileIn( __METHOD__ );
 
 		$sk = $this->getSkin();
 		$rev = new Revision( $row );
 
 		$page = Title::makeTitle( $row->page_namespace, $row->page_title );
-		$link = $sk->makeKnownLinkObj( $page );
+		$link = $sk->makeLinkObj( $page, $page->getPrefixedText(), $page->isRedirect() ? 'redirect=no' : '' );
+		# Mark current revisions
 		$difftext = $topmarktext = '';
 		if( $row->rev_id == $row->page_latest ) {
 			$topmarktext .= '<strong>' . $this->messages['uctop'] . '</strong>';
 			if( !$row->page_is_new ) {
 				$difftext .= '(' . $sk->makeKnownLinkObj( $page, $this->messages['diff'], 'diff=0' ) . ')';
+				# Add rollback link
+				if( $page->userCan( 'rollback') && $page->userCan( 'edit' ) ) {
+					$topmarktext .= ' '.$sk->generateRollback( $rev );
+				}
 			} else {
 				$difftext .= $this->messages['newarticle'];
 			}
-
-			if( $page->userCan( 'rollback') && $page->userCan( 'edit' ) ) {
-				$topmarktext .= ' '.$sk->generateRollback( $rev );
-			}
-
 		}
 		# Is there a visible previous revision?
 		if( $rev->userCan(Revision::DELETED_TEXT) ) {
-			$difftext = '(' . $sk->makeKnownLinkObj( $page, $this->messages['diff'], 'diff=prev&oldid='.$row->rev_id ) . ')';
+			$difftext = '(' . $sk->makeKnownLinkObj( $page, $this->messages['diff'],
+				'diff=prev&oldid='.$row->rev_id ) . ')';
 		} else {
 			$difftext = '(' . $this->messages['diff'] . ')';
 		}
-		$histlink='('.$sk->makeKnownLinkObj( $page, $this->messages['hist'], 'action=history' ) . ')';
+		$histlink = '('.$sk->makeKnownLinkObj( $page, $this->messages['hist'], 'action=history' ) . ')';
 
 		$comment = $wgContLang->getDirMark() . $sk->revComment( $rev, false, true );
 		$date = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
@@ -510,7 +510,7 @@ class ContribsPager extends ReverseChronologicalPager {
 			$nflag = '';
 		}
 
-		if( $row->rev_minor_edit ) {
+		if( $rev->isMinor() ) {
 			$mflag = '<span class="minor">' . $this->messages['minoreditletter'] . '</span> ';
 		} else {
 			$mflag = '';