From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Wed, 21 Sep 2011 05:52:55 +0000 (+0000)
Subject: Fix a conflict(?) in Special:Contributions in r97658.
X-Git-Tag: 1.31.0-rc.0~27510
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=ddf84e0ae8376d0fe45765e3dd204d311300190b;p=lhc%2Fweb%2Fwiklou.git

Fix a conflict(?) in Special:Contributions in r97658.
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index a9b7bf5c1b..e1ed54a51e 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -641,6 +641,13 @@ class ContribsPager extends ReverseChronologicalPager {
 			array( 'action' => 'history' )
 		);
 
+		if ( isset( $this->mParentLens[$row->rev_parent_id] ) ) {
+			$chardiff = ' . . ' . ChangesList::showCharacterDifference(
+				$this->mParentLens[$row->rev_parent_id], $row->rev_len ) . ' . . ';
+		} else {
+			$chardiff = '';
+		}
+
 		$comment = $this->getLang()->getDirMark() . Linker::revComment( $rev, false, true );
 		$date = $this->getLang()->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
 		if( $rev->userCan( Revision::DELETED_TEXT ) ) {