From: Priyanka Dhanda <pdhanda@users.mediawiki.org>
Date: Mon, 18 Oct 2010 18:28:16 +0000 (+0000)
Subject: Reverted accidental changes to DifferenceInterface in r74956
X-Git-Tag: 1.31.0-rc.0~34439
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=ba3ce41a72edb5d2cf5383aa6978562bf08c49ff;p=lhc%2Fweb%2Fwiklou.git

Reverted accidental changes to DifferenceInterface in r74956
---

diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index 82bd20ade4..f59aa56ba1 100644
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -456,23 +456,21 @@ CONTROL;
 				$wgOut->addHTML( htmlspecialchars( $this->mNewtext ) );
 				$wgOut->addHTML( "\n</pre>\n" );
 			}
-		} elseif( wfRunHooks( 'ArticleContentOnDiff', array( $this, &$wgOut ) ) ) {
-			if( $pCache ) {
-				$article = new Article( $this->mTitle, 0 );
-				$pOutput = ParserCache::singleton()->get( $article, $wgOut->parserOptions() );
-				if( $pOutput ) {
-					$wgOut->addParserOutput( $pOutput );
-				} else {
-					$article->doViewParse();
-				}
+		} elseif( $pCache ) {
+			$article = new Article( $this->mTitle, 0 );
+			$pOutput = ParserCache::singleton()->get( $article, $wgOut->parserOptions() );
+			if( $pOutput ) {
+				$wgOut->addParserOutput( $pOutput );
 			} else {
-				$wgOut->addWikiTextTidy( $this->mNewtext );
-			}
-			if( is_object( $this->mNewRev ) && !$this->mNewRev->isCurrent() ) {
-				$wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );
+				$article->doViewParse();
 			}
-		} 
+		} else {
+			$wgOut->addWikiTextTidy( $this->mNewtext );
+		}
 
+		if( is_object( $this->mNewRev ) && !$this->mNewRev->isCurrent() ) {
+			$wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );
+		}
 		# Add redundant patrol link on bottom...
 		if( $this->mRcidMarkPatrolled && $this->mTitle->quickUserCan('patrol') ) {
 			$sk = $wgUser->getSkin();