X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDifferenceEngine.php;h=d3bf205be64cc6db2c0aaad30bd9da9ccfb7d412;hb=3712ab270db601ad79f3b138ab43fd70fb6411e4;hp=7a2f3f7c33bf8a0f6959a55af7454b7ccc6ded40;hpb=087a9f70c5c152b72dc6c539cf64e334a0f2d029;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 7a2f3f7c33..d3bf205be6 100644
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -1,10 +1,6 @@
 <?php
 /**
  * @defgroup DifferenceEngine DifferenceEngine
- *
- * @file
- * See diff.doc
- * @todo indicate where diff.doc can be found.
  */
 
 /**
@@ -73,11 +69,16 @@ class DifferenceEngine {
 		$this->mRefreshCache = $refreshCache;
 	}
 
+	function getTitle() {
+		return $this->mTitle;
+	}
+
 	function showDiffPage( $diffOnly = false ) {
-		global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol;
+		global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol, $wgEnableHtmlDiff;
 		wfProfileIn( __METHOD__ );
 
-	 	# If external diffs are enabled both globally and for the user,
+
+		# If external diffs are enabled both globally and for the user,
 		# we'll use the application/x-external-editor interface to call
 		# an external diff tool like kompare, kdiff3, etc.
 		if($wgUseExternalEditor && $wgUser->getOption('externaldiff')) {
@@ -88,19 +89,19 @@ class DifferenceEngine {
 			$url2=$this->mTitle->getFullURL("action=raw&oldid=".$this->mNewid);
 			$special=$wgLang->getNsText(NS_SPECIAL);
 			$control=<<<CONTROL
-[Process]
-Type=Diff text
-Engine=MediaWiki
-Script={$wgServer}{$wgScript}
-Special namespace={$special}
-
-[File]
-Extension=wiki
-URL=$url1
-
-[File 2]
-Extension=wiki
-URL=$url2
+			[Process]
+			Type=Diff text
+			Engine=MediaWiki
+			Script={$wgServer}{$wgScript}
+			Special namespace={$special}
+
+			[File]
+			Extension=wiki
+			URL=$url1
+
+			[File 2]
+			Extension=wiki
+			URL=$url2
 CONTROL;
 			echo($control);
 			return;
@@ -108,9 +109,10 @@ CONTROL;
 
 		$wgOut->setArticleFlag( false );
 		if ( ! $this->loadRevisionData() ) {
-			$t = $this->mTitle->getPrefixedText() . ' ' . wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );
+			$t = $this->mTitle->getPrefixedText();
+			$d = wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );
 			$wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
-			$wgOut->addWikiMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
+			$wgOut->addWikiMsg( 'missing-article', "<nowiki>$t</nowiki>", $d );
 			wfProfileOut( __METHOD__ );
 			return;
 		}
@@ -141,7 +143,7 @@ CONTROL;
 			$wgOut->setPageTitle( $oldTitle . ', ' . $newTitle );
 		}
 		$wgOut->setSubtitle( wfMsg( 'difference' ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 
 		if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) {
 			$wgOut->loginToUse();
@@ -152,7 +154,9 @@ CONTROL;
 
 		$sk = $wgUser->getSkin();
 
-		if ( $this->mNewRev->isCurrent() && $wgUser->isAllowed('rollback') ) {
+		// Check if page is editable
+		$editable = $this->mNewRev->getTitle()->userCan( 'edit' );
+		if ( $editable && $this->mNewRev->isCurrent() && $wgUser->isAllowed( 'rollback' ) ) {
 			$rollback = '&nbsp;&nbsp;&nbsp;' . $sk->generateRollback( $this->mNewRev );
 		} else {
 			$rollback = '';
@@ -167,15 +171,15 @@ CONTROL;
 				// Look for an unpatrolled change corresponding to this diff
 				$db = wfGetDB( DB_SLAVE );
 				$change = RecentChange::newFromConds(
-					array(
-						// Add redundant user,timestamp condition so we can use the existing index
+				array(
+				// Add redundant user,timestamp condition so we can use the existing index
 						'rc_user_text'  => $this->mNewRev->getRawUserText(),
 						'rc_timestamp' => $db->timestamp( $this->mNewRev->getTimestamp() ),
 						'rc_this_oldid' => $this->mNewid,
 						'rc_last_oldid' => $this->mOldid,
 						'rc_patrolled' => 0
-					),
-					__METHOD__
+				),
+				__METHOD__
 				);
 				if( $change instanceof RecentChange ) {
 					$rcid = $change->mAttribs['rc_id'];
@@ -187,8 +191,8 @@ CONTROL;
 			// Build the link
 			if( $rcid ) {
 				$patrol = ' <span class="patrollink">[' . $sk->makeKnownLinkObj(
-					$this->mTitle,
-					wfMsgHtml( 'markaspatrolleddiff' ),
+				$this->mTitle,
+				wfMsgHtml( 'markaspatrolleddiff' ),
 					"action=markpatrolled&rcid={$rcid}"
 				) . ']</span>';
 			} else {
@@ -222,33 +226,33 @@ CONTROL;
 		if( $wgUser->isAllowed( 'deleterevision' ) ) {
 			$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
 			if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) {
-			// If revision was hidden from sysops
+				// If revision was hidden from sysops
 				$ldel = wfMsgHtml('rev-delundel');
 			} else {
 				$ldel = $sk->makeKnownLinkObj( $revdel,
-					wfMsgHtml('rev-delundel'),
+				wfMsgHtml('rev-delundel'),
 					'target=' . urlencode( $this->mOldRev->mTitle->getPrefixedDbkey() ) .
 					'&oldid=' . urlencode( $this->mOldRev->getId() ) );
 				// Bolden oversighted content
 				if( $this->mOldRev->isDeleted( Revision::DELETED_RESTRICTED ) )
-					$ldel = "<strong>$ldel</strong>";
+				$ldel = "<strong>$ldel</strong>";
 			}
 			$ldel = "&nbsp;&nbsp;&nbsp;<tt>(<small>$ldel</small>)</tt> ";
 			// We don't currently handle well changing the top revision's settings
 			if( $this->mNewRev->isCurrent() ) {
-			// If revision was hidden from sysops
+				// If revision was hidden from sysops
 				$rdel = wfMsgHtml('rev-delundel');
 			} else if( !$this->mNewRev->userCan( Revision::DELETED_RESTRICTED ) ) {
-			// If revision was hidden from sysops
+				// If revision was hidden from sysops
 				$rdel = wfMsgHtml('rev-delundel');
 			} else {
 				$rdel = $sk->makeKnownLinkObj( $revdel,
-					wfMsgHtml('rev-delundel'),
+				wfMsgHtml('rev-delundel'),
 					'target=' . urlencode( $this->mNewRev->mTitle->getPrefixedDbkey() ) .
 					'&oldid=' . urlencode( $this->mNewRev->getId() ) );
 				// Bolden oversighted content
 				if( $this->mNewRev->isDeleted( Revision::DELETED_RESTRICTED ) )
-					$rdel = "<strong>$rdel</strong>";
+				$rdel = "<strong>$rdel</strong>";
 			}
 			$rdel = "&nbsp;&nbsp;&nbsp;<tt>(<small>$rdel</small>)</tt> ";
 		}
@@ -262,11 +266,16 @@ CONTROL;
 			'<div id="mw-diff-ntitle3">' . $newminor . $sk->revComment( $this->mNewRev, !$diffOnly, true ) . $rdel . "</div>" .
 			'<div id="mw-diff-ntitle4">' . $nextlink . $patrol . '</div>';
 
-		$this->showDiff( $oldHeader, $newHeader );
+		if($wgEnableHtmlDiff){
+			$this->renderHtmlDiff();
+		}else{
 
-		if ( !$diffOnly )
-			$this->renderNewRevision();
+			$this->showDiff( $oldHeader, $newHeader );
 
+			if ( !$diffOnly ){
+				$this->renderNewRevision();
+			}
+		}
 		wfProfileOut( __METHOD__ );
 	}
 
@@ -280,9 +289,9 @@ CONTROL;
 		$wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
 		#add deleted rev tag if needed
 		if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
-		  	$wgOut->addWikiMsg( 'rev-deleted-text-permission' );
+			$wgOut->addWikiMsg( 'rev-deleted-text-permission' );
 		} else if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {
-		  	$wgOut->addWikiMsg( 'rev-deleted-text-view' );
+			$wgOut->addWikiMsg( 'rev-deleted-text-view' );
 		}
 
 		if( !$this->mNewRev->isCurrent() ) {
@@ -307,7 +316,7 @@ CONTROL;
 				$wgOut->addHtml( "\n</pre>\n" );
 			}
 		} else
-			$wgOut->addWikiTextTidy( $this->mNewtext );
+		$wgOut->addWikiTextTidy( $this->mNewtext );
 
 		if( !$this->mNewRev->isCurrent() ) {
 			$wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );
@@ -316,6 +325,65 @@ CONTROL;
 		wfProfileOut( __METHOD__ );
 	}
 
+
+	function renderHtmlDiff() {
+		global $wgOut;
+		wfProfileIn( __METHOD__ );
+
+		$this->showDiffStyle();
+
+		#add deleted rev tag if needed
+		if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
+			$wgOut->addWikiMsg( 'rev-deleted-text-permission' );
+		} else if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {
+			$wgOut->addWikiMsg( 'rev-deleted-text-view' );
+		}
+
+		if( !$this->mNewRev->isCurrent() ) {
+			$oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false );
+		}
+
+		$this->loadText();
+
+		if( is_object( $this->mOldRev ) ) {
+			$wgOut->setRevisionId( $this->mOldRev->getId() );
+		}
+
+		global $wgTitle, $wgParser, $wgTitle;
+		$popts = $wgOut->parserOptions();
+		$oldTidy = $popts->setTidy( TRUE );
+
+		$parserOutput = $wgParser->parse($this->mOldtext, $wgTitle, $popts, TRUE, TRUE, $wgOut->mRevisionId );
+		$popts->setTidy( $oldTidy );
+
+		//only for new?
+		//$wgOut->addParserOutputNoText( $parserOutput );
+		$oldHtml =	$parserOutput->getText();
+		wfRunHooks( 'OutputPageBeforeHTML',array( &$wgOut, &$oldHtml ) );
+
+		if( is_object( $this->mNewRev ) ) {
+			$wgOut->setRevisionId( $this->mNewRev->getId() );
+		}
+
+		$popts = $wgOut->parserOptions();
+		$oldTidy = $popts->setTidy( TRUE );
+
+		$parserOutput = $wgParser->parse($this->mNewtext, $wgTitle, $popts, TRUE, TRUE, $wgOut->mRevisionId );
+		$popts->setTidy( $oldTidy );
+
+		//only for new?
+		$wgOut->addParserOutputNoText( $parserOutput );
+		$newHtml =	$parserOutput->getText();
+		wfRunHooks( 'OutputPageBeforeHTML',array( &$wgOut, &$newHtml ) );
+
+		unset($parserOutput,$popts);
+
+		$differ = new HTMLDiffer(new DelegatingContentHandler($wgOut));
+		$differ->htmlDiff($oldHtml, $newHtml);
+
+		wfProfileOut( __METHOD__ );
+	}
+
 	/**
 	 * Show the first revision of an article. Uses normal diff headers in
 	 * contrast to normal "old revision" display style.
@@ -327,9 +395,10 @@ CONTROL;
 		# Get article text from the DB
 		#
 		if ( ! $this->loadNewText() ) {
-			$t = $this->mTitle->getPrefixedText() . ' ' . wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );
+			$t = $this->mTitle->getPrefixedText();
+			$d = wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );
 			$wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
-			$wgOut->addWikiMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
+			$wgOut->addWikiMsg( 'missing-article', "<nowiki>$t</nowiki>", $d );
 			wfProfileOut( __METHOD__ );
 			return;
 		}
@@ -352,14 +421,14 @@ CONTROL;
 
 		$nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
 		$header = "<div class=\"firstrevisionheader\" style=\"text-align: center\"><strong>{$this->mOldtitle}</strong><br />" .
-			$sk->revUserTools( $this->mNewRev ) . "<br />" .
-			$sk->revComment( $this->mNewRev ) . "<br />" .
-			$nextlink . "</div>\n";
+		$sk->revUserTools( $this->mNewRev ) . "<br />" .
+		$sk->revComment( $this->mNewRev ) . "<br />" .
+		$nextlink . "</div>\n";
 
 		$wgOut->addHTML( $header );
 
 		$wgOut->setSubtitle( wfMsg( 'difference' ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 
 		wfProfileOut( __METHOD__ );
 	}
@@ -372,7 +441,7 @@ CONTROL;
 		global $wgOut;
 		$diff = $this->getDiff( $otitle, $ntitle );
 		if ( $diff === false ) {
-			$wgOut->addWikiMsg( 'missingarticle', "<nowiki>(fixme, bug)</nowiki>" );
+			$wgOut->addWikiMsg( 'missing-article', "<nowiki>(fixme, bug)</nowiki>", '' );
 			return false;
 		} else {
 			$this->showDiffStyle();
@@ -419,9 +488,9 @@ CONTROL;
 		wfProfileIn( __METHOD__ );
 		// Check if the diff should be hidden from this user
 		if ( $this->mOldRev && !$this->mOldRev->userCan(Revision::DELETED_TEXT) ) {
-		  	return '';
+			return '';
 		} else if ( $this->mNewRev && !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
-		  	return '';
+			return '';
 		}
 		// Cacheable?
 		$key = false;
@@ -482,7 +551,7 @@ CONTROL;
 				dl('php_wikidiff.so');
 			}
 			return $wgContLang->unsegementForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) ) .
-				$this->debug( 'wikidiff1' );
+			$this->debug( 'wikidiff1' );
 		}
 
 		if ( $wgExternalDiffEngine == 'wikidiff2' ) {
@@ -501,7 +570,7 @@ CONTROL;
 				return $text;
 			}
 		}
-		if ( $wgExternalDiffEngine !== false ) {
+		if ( $wgExternalDiffEngine != 'wikidiff3' && $wgExternalDiffEngine !== false ) {
 			# Diff via the shell
 			global $wgTmpDirectory;
 			$tempName1 = tempnam( $wgTmpDirectory, 'diff_' );
@@ -537,9 +606,9 @@ CONTROL;
 		$diffs = new Diff( $ota, $nta );
 		$formatter = new TableDiffFormatter();
 		return $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) ) .
-			$this->debug();
+		$this->debug();
 	}
-	
+
 	/**
 	 * Generate a debug comment indicating diff generating time,
 	 * server node, and generator backend.
@@ -552,10 +621,10 @@ CONTROL;
 		}
 		$data[] = wfTimestamp( TS_DB );
 		return "<!-- diff generator: " .
-			implode( " ",
-				array_map(
+		implode( " ",
+		array_map(
 					"htmlspecialchars",
-						$data ) ) .
+		$data ) ) .
 			" -->\n";
 	}
 
@@ -564,7 +633,7 @@ CONTROL;
 	 */
 	function localiseLineNumbers( $text ) {
 		return preg_replace_callback( '/<!--LINE (\d+)-->/',
-			array( &$this, 'localiseLineNumbersCb' ), $text );
+		array( &$this, 'localiseLineNumbersCb' ), $text );
 	}
 
 	function localiseLineNumbersCb( $matches ) {
@@ -578,7 +647,7 @@ CONTROL;
 	 */
 	function getMultiNotice() {
 		if ( !is_object($this->mOldRev) || !is_object($this->mNewRev) )
-			return '';
+		return '';
 
 		if( !$this->mOldPage->equals( $this->mNewPage ) ) {
 			// Comparing two different pages? Count would be meaningless.
@@ -593,7 +662,7 @@ CONTROL;
 
 		$n = $this->mTitle->countRevisionsBetween( $oldid, $newid );
 		if ( !$n )
-			return '';
+		return '';
 
 		return wfMsgExt( 'diff-multi', array( 'parseinline' ), $n );
 	}
@@ -606,19 +675,19 @@ CONTROL;
 		global $wgOut;
 
 		$header = "
-			<table class='diff'>
-			<col class='diff-marker' />
-			<col class='diff-content' />
-			<col class='diff-marker' />
-			<col class='diff-content' />
-			<tr valign='top'>
-				<td colspan='2' class='diff-otitle'>{$otitle}</td>
-				<td colspan='2' class='diff-ntitle'>{$ntitle}</td>
-			</tr>
+		<table class='diff'>
+		<col class='diff-marker' />
+		<col class='diff-content' />
+		<col class='diff-marker' />
+		<col class='diff-content' />
+		<tr valign='top'>
+		<td colspan='2' class='diff-otitle'>{$otitle}</td>
+		<td colspan='2' class='diff-ntitle'>{$ntitle}</td>
+		</tr>
 		";
 
 		if ( $multi != '' )
-			$header .= "<tr><td colspan='4' align='center' class='diff-multi'>{$multi}</td></tr>";
+		$header .= "<tr><td colspan='4' align='center' class='diff-multi'>{$multi}</td></tr>";
 
 		return $header . $diff . "</table>";
 	}
@@ -653,10 +722,10 @@ CONTROL;
 
 		// Load the new revision object
 		$this->mNewRev = $this->mNewid
-			? Revision::newFromId( $this->mNewid )
-			: Revision::newFromTitle( $this->mTitle );
+		? Revision::newFromId( $this->mNewid )
+		: Revision::newFromTitle( $this->mTitle );
 		if( !$this->mNewRev instanceof Revision )
-			return false;
+		return false;
 
 		// Update the new revision ID in case it was 0 (makes life easier doing UI stuff)
 		$this->mNewid = $this->mNewRev->getId();
@@ -668,7 +737,7 @@ CONTROL;
 		$timestamp = $wgLang->timeanddate( $this->mNewRev->getTimestamp(), true );
 		$this->mNewPage = $this->mNewRev->getTitle();
 		if( $this->mNewRev->isCurrent() ) {
-			$newLink = $this->mNewPage->escapeLocalUrl();
+			$newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid );
 			$this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) );
 			$newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit' );
 
@@ -684,9 +753,9 @@ CONTROL;
 			$this->mNewtitle .= " (<a href='$newEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";
 		}
 		if ( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
-		  	$this->mNewtitle = "<span class='history-deleted'>{$this->mPagetitle}</span>";
+			$this->mNewtitle = "<span class='history-deleted'>{$this->mPagetitle}</span>";
 		} else if ( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {
-		  	$this->mNewtitle = '<span class="history-deleted">'.$this->mNewtitle.'</span>';
+			$this->mNewtitle = '<span class="history-deleted">'.$this->mNewtitle.'</span>';
 		}
 
 		// Load the old revision object
@@ -718,7 +787,7 @@ CONTROL;
 			$this->mOldPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t ) );
 
 			$this->mOldtitle = "<a href='$oldLink'>{$this->mOldPagetitle}</a>"
-				. " (<a href='$oldEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";
+			. " (<a href='$oldEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";
 			// Add an "undo" link
 			$newUndo = $this->mNewPage->escapeLocalUrl( 'action=edit&undoafter=' . $this->mOldid . '&undo=' . $this->mNewid);
 			if( $editable && !$this->mOldRev->isDeleted( Revision::DELETED_TEXT ) && !$this->mNewRev->isDeleted( Revision::DELETED_TEXT ) ) {
@@ -726,9 +795,9 @@ CONTROL;
 			}
 
 			if( !$this->mOldRev->userCan( Revision::DELETED_TEXT ) ) {
-		  		$this->mOldtitle = '<span class="history-deleted">' . $this->mOldPagetitle . '</span>';
+				$this->mOldtitle = '<span class="history-deleted">' . $this->mOldPagetitle . '</span>';
 			} else if( $this->mOldRev->isDeleted( Revision::DELETED_TEXT ) ) {
-		  		$this->mOldtitle = '<span class="history-deleted">' . $this->mOldtitle . '</span>';
+				$this->mOldtitle = '<span class="history-deleted">' . $this->mOldtitle . '</span>';
 			}
 		}
 
@@ -824,7 +893,7 @@ class _DiffOp_Copy extends _DiffOp {
 
 	function _DiffOp_Copy ($orig, $closing = false) {
 		if (!is_array($closing))
-			$closing = $orig;
+		$closing = $orig;
 		$this->orig = $orig;
 		$this->closing = $closing;
 	}
@@ -888,7 +957,6 @@ class _DiffOp_Change extends _DiffOp {
 	}
 }
 
-
 /**
  * Class used internally by Diff to actually compute the diffs.
  *
@@ -907,70 +975,30 @@ class _DiffOp_Change extends _DiffOp {
  * are my own.
  *
  * Line length limits for robustness added by Tim Starling, 2005-08-31
+ * Alternative implementation added by Guy Van den Broeck, 2008-07-30
  *
- * @author Geoffrey T. Dairiki, Tim Starling
+ * @author Geoffrey T. Dairiki, Tim Starling, Guy Van den Broeck
  * @private
  * @ingroup DifferenceEngine
  */
 class _DiffEngine {
+
 	const MAX_XREF_LENGTH =  10000;
 
-	function diff ($from_lines, $to_lines) {
+	function diff ($from_lines, $to_lines){
 		wfProfileIn( __METHOD__ );
 
-		$n_from = sizeof($from_lines);
-		$n_to = sizeof($to_lines);
-
-		$this->xchanged = $this->ychanged = array();
-		$this->xv = $this->yv = array();
-		$this->xind = $this->yind = array();
-		unset($this->seq);
-		unset($this->in_seq);
-		unset($this->lcs);
-
-		// Skip leading common lines.
-		for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
-			if ($from_lines[$skip] !== $to_lines[$skip])
-				break;
-			$this->xchanged[$skip] = $this->ychanged[$skip] = false;
-		}
-		// Skip trailing common lines.
-		$xi = $n_from; $yi = $n_to;
-		for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
-			if ($from_lines[$xi] !== $to_lines[$yi])
-				break;
-			$this->xchanged[$xi] = $this->ychanged[$yi] = false;
-		}
-
-		// Ignore lines which do not exist in both files.
-		for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
-			$xhash[$this->_line_hash($from_lines[$xi])] = 1;
-		}
-
-		for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
-			$line = $to_lines[$yi];
-			if ( ($this->ychanged[$yi] = empty($xhash[$this->_line_hash($line)])) )
-				continue;
-			$yhash[$this->_line_hash($line)] = 1;
-			$this->yv[] = $line;
-			$this->yind[] = $yi;
-		}
-		for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
-			$line = $from_lines[$xi];
-			if ( ($this->xchanged[$xi] = empty($yhash[$this->_line_hash($line)])) )
-				continue;
-			$this->xv[] = $line;
-			$this->xind[] = $xi;
-		}
-
-		// Find the LCS.
-		$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
+		// Diff and store locally
+		$this->diff_local($from_lines, $to_lines);
 
 		// Merge edits when possible
 		$this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged);
 		$this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
 
 		// Compute the edit operations.
+		$n_from = sizeof($from_lines);
+		$n_to = sizeof($to_lines);
+
 		$edits = array();
 		$xi = $yi = 0;
 		while ($xi < $n_from || $yi < $n_to) {
@@ -980,33 +1008,96 @@ class _DiffEngine {
 			// Skip matching "snake".
 			$copy = array();
 			while ( $xi < $n_from && $yi < $n_to
-					&& !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+			&& !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
 				$copy[] = $from_lines[$xi++];
 				++$yi;
 			}
 			if ($copy)
-				$edits[] = new _DiffOp_Copy($copy);
+			$edits[] = new _DiffOp_Copy($copy);
 
 			// Find deletes & adds.
 			$delete = array();
 			while ($xi < $n_from && $this->xchanged[$xi])
-				$delete[] = $from_lines[$xi++];
+			$delete[] = $from_lines[$xi++];
 
 			$add = array();
 			while ($yi < $n_to && $this->ychanged[$yi])
-				$add[] = $to_lines[$yi++];
+			$add[] = $to_lines[$yi++];
 
 			if ($delete && $add)
-				$edits[] = new _DiffOp_Change($delete, $add);
+			$edits[] = new _DiffOp_Change($delete, $add);
 			elseif ($delete)
-				$edits[] = new _DiffOp_Delete($delete);
+			$edits[] = new _DiffOp_Delete($delete);
 			elseif ($add)
-				$edits[] = new _DiffOp_Add($add);
+			$edits[] = new _DiffOp_Add($add);
 		}
 		wfProfileOut( __METHOD__ );
 		return $edits;
 	}
 
+	function diff_local ($from_lines, $to_lines) {
+		global $wgExternalDiffEngine;
+		wfProfileIn( __METHOD__);
+
+		if($wgExternalDiffEngine == 'wikidiff3'){
+			// wikidiff3
+			$wikidiff3 = new WikiDiff3();
+			$wikidiff3->diff($from_lines, $to_lines);
+			$this->xchanged = $wikidiff3->removed;
+			$this->ychanged = $wikidiff3->added;
+			unset($wikidiff3);
+		}else{
+			// old diff
+			$n_from = sizeof($from_lines);
+			$n_to = sizeof($to_lines);
+			$this->xchanged = $this->ychanged = array();
+			$this->xv = $this->yv = array();
+			$this->xind = $this->yind = array();
+			unset($this->seq);
+			unset($this->in_seq);
+			unset($this->lcs);
+
+			// Skip leading common lines.
+			for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
+				if ($from_lines[$skip] !== $to_lines[$skip])
+				break;
+				$this->xchanged[$skip] = $this->ychanged[$skip] = false;
+			}
+			// Skip trailing common lines.
+			$xi = $n_from; $yi = $n_to;
+			for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
+				if ($from_lines[$xi] !== $to_lines[$yi])
+				break;
+				$this->xchanged[$xi] = $this->ychanged[$yi] = false;
+			}
+
+			// Ignore lines which do not exist in both files.
+			for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+				$xhash[$this->_line_hash($from_lines[$xi])] = 1;
+			}
+
+			for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
+				$line = $to_lines[$yi];
+				if ( ($this->ychanged[$yi] = empty($xhash[$this->_line_hash($line)])) )
+				continue;
+				$yhash[$this->_line_hash($line)] = 1;
+				$this->yv[] = $line;
+				$this->yind[] = $yi;
+			}
+			for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+				$line = $from_lines[$xi];
+				if ( ($this->xchanged[$xi] = empty($yhash[$this->_line_hash($line)])) )
+				continue;
+				$this->xv[] = $line;
+				$this->xind[] = $xi;
+			}
+
+			// Find the LCS.
+			$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
+		}
+		wfProfileOut( __METHOD__ );
+	}
+
 	/**
 	 * Returns the whole line if it's small enough, or the MD5 hash otherwise
 	 */
@@ -1018,7 +1109,6 @@ class _DiffEngine {
 		}
 	}
 
-
 	/* Divide the Largest Common Subsequence (LCS) of the sequences
 	 * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
 	 * sized segments.
@@ -1036,23 +1126,22 @@ class _DiffEngine {
 	 * of the portions it is going to specify.
 	 */
 	function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
-		wfProfileIn( __METHOD__ );
 		$flip = false;
 
 		if ($xlim - $xoff > $ylim - $yoff) {
 			// Things seems faster (I'm not sure I understand why)
-				// when the shortest sequence in X.
-				$flip = true;
+			// when the shortest sequence in X.
+			$flip = true;
 			list ($xoff, $xlim, $yoff, $ylim)
 			= array( $yoff, $ylim, $xoff, $xlim);
 		}
 
 		if ($flip)
-			for ($i = $ylim - 1; $i >= $yoff; $i--)
-				$ymatches[$this->xv[$i]][] = $i;
+		for ($i = $ylim - 1; $i >= $yoff; $i--)
+		$ymatches[$this->xv[$i]][] = $i;
 		else
-			for ($i = $ylim - 1; $i >= $yoff; $i--)
-				$ymatches[$this->yv[$i]][] = $i;
+		for ($i = $ylim - 1; $i >= $yoff; $i--)
+		$ymatches[$this->yv[$i]][] = $i;
 
 		$this->lcs = 0;
 		$this->seq[0]= $yoff - 1;
@@ -1062,25 +1151,24 @@ class _DiffEngine {
 		$numer = $xlim - $xoff + $nchunks - 1;
 		$x = $xoff;
 		for ($chunk = 0; $chunk < $nchunks; $chunk++) {
-			wfProfileIn( __METHOD__ . "-chunk" );
 			if ($chunk > 0)
-				for ($i = 0; $i <= $this->lcs; $i++)
-					$ymids[$i][$chunk-1] = $this->seq[$i];
+			for ($i = 0; $i <= $this->lcs; $i++)
+			$ymids[$i][$chunk-1] = $this->seq[$i];
 
 			$x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
 			for ( ; $x < $x1; $x++) {
 				$line = $flip ? $this->yv[$x] : $this->xv[$x];
-					if (empty($ymatches[$line]))
-						continue;
+				if (empty($ymatches[$line]))
+				continue;
 				$matches = $ymatches[$line];
 				reset($matches);
 				while (list ($junk, $y) = each($matches))
-					if (empty($this->in_seq[$y])) {
-						$k = $this->_lcs_pos($y);
-						USE_ASSERTS && assert($k > 0);
-						$ymids[$k] = $ymids[$k-1];
-						break;
-					}
+				if (empty($this->in_seq[$y])) {
+					$k = $this->_lcs_pos($y);
+					USE_ASSERTS && assert($k > 0);
+					$ymids[$k] = $ymids[$k-1];
+					break;
+				}
 				while (list ( /* $junk */, $y) = each($matches)) {
 					if ($y > $this->seq[$k-1]) {
 						USE_ASSERTS && assert($y < $this->seq[$k]);
@@ -1096,7 +1184,6 @@ class _DiffEngine {
 					}
 				}
 			}
-			wfProfileOut( __METHOD__ . "-chunk" );
 		}
 
 		$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
@@ -1108,18 +1195,14 @@ class _DiffEngine {
 		}
 		$seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
 
-		wfProfileOut( __METHOD__ );
 		return array($this->lcs, $seps);
 	}
 
 	function _lcs_pos ($ypos) {
-		wfProfileIn( __METHOD__ );
-
 		$end = $this->lcs;
 		if ($end == 0 || $ypos > $this->seq[$end]) {
 			$this->seq[++$this->lcs] = $ypos;
 			$this->in_seq[$ypos] = 1;
-			wfProfileOut( __METHOD__ );
 			return $this->lcs;
 		}
 
@@ -1127,9 +1210,9 @@ class _DiffEngine {
 		while ($beg < $end) {
 			$mid = (int)(($beg + $end) / 2);
 			if ( $ypos > $this->seq[$mid] )
-				$beg = $mid + 1;
+			$beg = $mid + 1;
 			else
-				$end = $mid;
+			$end = $mid;
 		}
 
 		USE_ASSERTS && assert($ypos != $this->seq[$end]);
@@ -1137,7 +1220,6 @@ class _DiffEngine {
 		$this->in_seq[$this->seq[$end]] = false;
 		$this->seq[$end] = $ypos;
 		$this->in_seq[$ypos] = 1;
-		wfProfileOut( __METHOD__ );
 		return $end;
 	}
 
@@ -1153,24 +1235,22 @@ class _DiffEngine {
 	 * All line numbers are origin-0 and discarded lines are not counted.
 	 */
 	function _compareseq ($xoff, $xlim, $yoff, $ylim) {
-		wfProfileIn( __METHOD__ );
-
 		// Slide down the bottom initial diagonal.
 		while ($xoff < $xlim && $yoff < $ylim
-			   && $this->xv[$xoff] == $this->yv[$yoff]) {
+		&& $this->xv[$xoff] == $this->yv[$yoff]) {
 			++$xoff;
 			++$yoff;
 		}
 
 		// Slide up the top initial diagonal.
 		while ($xlim > $xoff && $ylim > $yoff
-			   && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
+		&& $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
 			--$xlim;
 			--$ylim;
 		}
 
 		if ($xoff == $xlim || $yoff == $ylim)
-			$lcs = 0;
+		$lcs = 0;
 		else {
 			// This is ad hoc but seems to work well.
 			//$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
@@ -1184,9 +1264,9 @@ class _DiffEngine {
 			// X and Y sequences have no common subsequence:
 			// mark all changed.
 			while ($yoff < $ylim)
-				$this->ychanged[$this->yind[$yoff++]] = 1;
+			$this->ychanged[$this->yind[$yoff++]] = 1;
 			while ($xoff < $xlim)
-				$this->xchanged[$this->xind[$xoff++]] = 1;
+			$this->xchanged[$this->xind[$xoff++]] = 1;
 		} else {
 			// Use the partitions to split this problem into subproblems.
 			reset($seps);
@@ -1196,7 +1276,6 @@ class _DiffEngine {
 				$pt1 = $pt2;
 			}
 		}
-		wfProfileOut( __METHOD__ );
 	}
 
 	/* Adjust inserts/deletes of identical lines to join changes
@@ -1233,23 +1312,23 @@ class _DiffEngine {
 			 * $other_changed[$j] == false.
 			 */
 			while ($j < $other_len && $other_changed[$j])
-				$j++;
+			$j++;
 
 			while ($i < $len && ! $changed[$i]) {
 				USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
 				$i++; $j++;
 				while ($j < $other_len && $other_changed[$j])
-					$j++;
+				$j++;
 			}
 
 			if ($i == $len)
-				break;
+			break;
 
 			$start = $i;
 
 			// Find the end of this run of changes.
 			while (++$i < $len && $changed[$i])
-				continue;
+			continue;
 
 			do {
 				/*
@@ -1267,10 +1346,10 @@ class _DiffEngine {
 					$changed[--$start] = 1;
 					$changed[--$i] = false;
 					while ($start > 0 && $changed[$start - 1])
-						$start--;
+					$start--;
 					USE_ASSERTS && assert('$j > 0');
 					while ($other_changed[--$j])
-						continue;
+					continue;
 					USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
 				}
 
@@ -1292,14 +1371,14 @@ class _DiffEngine {
 					$changed[$start++] = false;
 					$changed[$i++] = 1;
 					while ($i < $len && $changed[$i])
-						$i++;
+					$i++;
 
 					USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
 					$j++;
 					if ($j < $other_len && $other_changed[$j]) {
 						$corresponding = $i;
 						while ($j < $other_len && $other_changed[$j])
-							$j++;
+						$j++;
 					}
 				}
 			} while ($runlength != $i - $start);
@@ -1313,7 +1392,7 @@ class _DiffEngine {
 				$changed[--$i] = 0;
 				USE_ASSERTS && assert('$j > 0');
 				while ($other_changed[--$j])
-					continue;
+				continue;
 				USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
 			}
 		}
@@ -1372,7 +1451,7 @@ class Diff
 	function isEmpty () {
 		foreach ($this->edits as $edit) {
 			if ($edit->type != 'copy')
-				return false;
+			return false;
 		}
 		return true;
 	}
@@ -1388,7 +1467,7 @@ class Diff
 		$lcs = 0;
 		foreach ($this->edits as $edit) {
 			if ($edit->type == 'copy')
-				$lcs += sizeof($edit->orig);
+			$lcs += sizeof($edit->orig);
 		}
 		return $lcs;
 	}
@@ -1406,7 +1485,7 @@ class Diff
 
 		foreach ($this->edits as $edit) {
 			if ($edit->orig)
-				array_splice($lines, sizeof($lines), 0, $edit->orig);
+			array_splice($lines, sizeof($lines), 0, $edit->orig);
 		}
 		return $lines;
 	}
@@ -1424,7 +1503,7 @@ class Diff
 
 		foreach ($this->edits as $edit) {
 			if ($edit->closing)
-				array_splice($lines, sizeof($lines), 0, $edit->closing);
+			array_splice($lines, sizeof($lines), 0, $edit->closing);
 		}
 		return $lines;
 	}
@@ -1437,21 +1516,21 @@ class Diff
 	function _check ($from_lines, $to_lines) {
 		wfProfileIn( __METHOD__ );
 		if (serialize($from_lines) != serialize($this->orig()))
-			trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
+		trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
 		if (serialize($to_lines) != serialize($this->closing()))
-			trigger_error("Reconstructed closing doesn't match", E_USER_ERROR);
+		trigger_error("Reconstructed closing doesn't match", E_USER_ERROR);
 
 		$rev = $this->reverse();
 		if (serialize($to_lines) != serialize($rev->orig()))
-			trigger_error("Reversed original doesn't match", E_USER_ERROR);
+		trigger_error("Reversed original doesn't match", E_USER_ERROR);
 		if (serialize($from_lines) != serialize($rev->closing()))
-			trigger_error("Reversed closing doesn't match", E_USER_ERROR);
+		trigger_error("Reversed closing doesn't match", E_USER_ERROR);
 
 
 		$prevtype = 'none';
 		foreach ($this->edits as $edit) {
 			if ( $prevtype == $edit->type )
-				trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+			trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
 			$prevtype = $edit->type;
 		}
 
@@ -1492,7 +1571,7 @@ class MappedDiff extends Diff
 	 *	have the same number of elements as $to_lines.
 	 */
 	function MappedDiff($from_lines, $to_lines,
-		$mapped_from_lines, $mapped_to_lines) {
+	$mapped_from_lines, $mapped_to_lines) {
 		wfProfileIn( __METHOD__ );
 
 		assert(sizeof($from_lines) == sizeof($mapped_from_lines));
@@ -1575,8 +1654,8 @@ class DiffFormatter {
 							$block[] = new _DiffOp_Copy($context);
 						}
 						$this->_block($x0, $ntrail + $xi - $x0,
-									  $y0, $ntrail + $yi - $y0,
-									  $block);
+						$y0, $ntrail + $yi - $y0,
+						$block);
 						$block = false;
 					}
 				}
@@ -1589,21 +1668,21 @@ class DiffFormatter {
 					$y0 = $yi - sizeof($context);
 					$block = array();
 					if ($context)
-						$block[] = new _DiffOp_Copy($context);
+					$block[] = new _DiffOp_Copy($context);
 				}
 				$block[] = $edit;
 			}
 
 			if ($edit->orig)
-				$xi += sizeof($edit->orig);
+			$xi += sizeof($edit->orig);
 			if ($edit->closing)
-				$yi += sizeof($edit->closing);
+			$yi += sizeof($edit->closing);
 		}
 
 		if (is_array($block))
-			$this->_block($x0, $xi - $x0,
-						  $y0, $yi - $y0,
-						  $block);
+		$this->_block($x0, $xi - $x0,
+		$y0, $yi - $y0,
+		$block);
 
 		$end = $this->_end_diff();
 		wfProfileOut( __METHOD__ );
@@ -1615,15 +1694,15 @@ class DiffFormatter {
 		$this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
 		foreach ($edits as $edit) {
 			if ($edit->type == 'copy')
-				$this->_context($edit->orig);
+			$this->_context($edit->orig);
 			elseif ($edit->type == 'add')
-				$this->_added($edit->closing);
+			$this->_added($edit->closing);
 			elseif ($edit->type == 'delete')
-				$this->_deleted($edit->orig);
+			$this->_deleted($edit->orig);
 			elseif ($edit->type == 'change')
-				$this->_changed($edit->orig, $edit->closing);
+			$this->_changed($edit->orig, $edit->closing);
 			else
-				trigger_error('Unknown edit type', E_USER_ERROR);
+			trigger_error('Unknown edit type', E_USER_ERROR);
 		}
 		$this->_end_block();
 		wfProfileOut( __METHOD__ );
@@ -1641,9 +1720,9 @@ class DiffFormatter {
 
 	function _block_header($xbeg, $xlen, $ybeg, $ylen) {
 		if ($xlen > 1)
-			$xbeg .= "," . ($xbeg + $xlen - 1);
+		$xbeg .= "," . ($xbeg + $xlen - 1);
 		if ($ylen > 1)
-			$ybeg .= "," . ($ybeg + $ylen - 1);
+		$ybeg .= "," . ($ybeg + $ylen - 1);
 
 		return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
 	}
@@ -1657,7 +1736,7 @@ class DiffFormatter {
 
 	function _lines($lines, $prefix = ' ') {
 		foreach ($lines as $line)
-			echo "$prefix $line\n";
+		echo "$prefix $line\n";
 	}
 
 	function _context($lines) {
@@ -1712,40 +1791,40 @@ class ArrayDiffFormatter extends DiffFormatter {
 		$newline = 1;
 		$retval = array();
 		foreach($diff->edits as $edit)
-			switch($edit->type) {
-				case 'add':
-					foreach($edit->closing as $l) {
-						$retval[] = array(
+		switch($edit->type) {
+			case 'add':
+				foreach($edit->closing as $l) {
+					$retval[] = array(
 							'action' => 'add',
 							'new'=> $l,
 							'newline' => $newline++
-						);
-					}
-					break;
-				case 'delete':
-					foreach($edit->orig as $l) {
-						$retval[] = array(
+					);
+				}
+				break;
+			case 'delete':
+				foreach($edit->orig as $l) {
+					$retval[] = array(
 							'action' => 'delete',
 							'old' => $l,
 							'oldline' => $oldline++,
-						);
-					}
-					break;
-				case 'change':
-					foreach($edit->orig as $i => $l) {
-						$retval[] = array(
+					);
+				}
+				break;
+			case 'change':
+				foreach($edit->orig as $i => $l) {
+					$retval[] = array(
 							'action' => 'change',
 							'old' => $l,
 							'new' => @$edit->closing[$i],
 							'oldline' => $oldline++,
 							'newline' => $newline++,
-						);
-					}
-					break;
-				case 'copy':
-					$oldline += count($edit->orig);
-					$newline += count($edit->orig);
-			}
+					);
+				}
+				break;
+			case 'copy':
+				$oldline += count($edit->orig);
+				$newline += count($edit->orig);
+		}
 		return $retval;
 	}
 }
@@ -1773,13 +1852,13 @@ class _HWLDF_WordAccumulator {
 	function _flushGroup ($new_tag) {
 		if ($this->_group !== '') {
 			if ($this->_tag == 'ins')
-				$this->_line .= '<ins class="diffchange diffchange-inline">' .
-					htmlspecialchars ( $this->_group ) . '</ins>';
+			$this->_line .= '<ins class="diffchange diffchange-inline">' .
+			htmlspecialchars ( $this->_group ) . '</ins>';
 			elseif ($this->_tag == 'del')
-				$this->_line .= '<del class="diffchange diffchange-inline">' .
-					htmlspecialchars ( $this->_group ) . '</del>';
+			$this->_line .= '<del class="diffchange diffchange-inline">' .
+			htmlspecialchars ( $this->_group ) . '</del>';
 			else
-				$this->_line .= htmlspecialchars ( $this->_group );
+			$this->_line .= htmlspecialchars ( $this->_group );
 		}
 		$this->_group = '';
 		$this->_tag = $new_tag;
@@ -1788,21 +1867,21 @@ class _HWLDF_WordAccumulator {
 	function _flushLine ($new_tag) {
 		$this->_flushGroup($new_tag);
 		if ($this->_line != '')
-			array_push ( $this->_lines, $this->_line );
+		array_push ( $this->_lines, $this->_line );
 		else
-			# make empty lines visible by inserting an NBSP
-			array_push ( $this->_lines, NBSP );
+		# make empty lines visible by inserting an NBSP
+		array_push ( $this->_lines, NBSP );
 		$this->_line = '';
 	}
 
 	function addWords ($words, $tag = '') {
 		if ($tag != $this->_tag)
-			$this->_flushGroup($tag);
+		$this->_flushGroup($tag);
 
 		foreach ($words as $word) {
 			// new-line should only come as first char of word.
 			if ($word == '')
-				continue;
+			continue;
 			if ($word[0] == "\n") {
 				$this->_flushLine($tag);
 				$word = substr($word, 1);
@@ -1833,7 +1912,7 @@ class WordLevelDiff extends MappedDiff {
 		list ($closing_words, $closing_stripped) = $this->_split($closing_lines);
 
 		$this->MappedDiff($orig_words, $closing_words,
-			$orig_stripped, $closing_stripped);
+		$orig_stripped, $closing_stripped);
 		wfProfileOut( __METHOD__ );
 	}
 
@@ -1858,7 +1937,7 @@ class WordLevelDiff extends MappedDiff {
 			} else {
 				$m = array();
 				if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
-					$line, $m))
+				$line, $m))
 				{
 					$words = array_merge( $words, $m[0] );
 					$stripped = array_merge( $stripped, $m[1] );
@@ -1875,9 +1954,9 @@ class WordLevelDiff extends MappedDiff {
 
 		foreach ($this->edits as $edit) {
 			if ($edit->type == 'copy')
-				$orig->addWords($edit->orig);
+			$orig->addWords($edit->orig);
 			elseif ($edit->orig)
-				$orig->addWords($edit->orig, 'del');
+			$orig->addWords($edit->orig, 'del');
 		}
 		$lines = $orig->getLines();
 		wfProfileOut( __METHOD__ );
@@ -1890,9 +1969,9 @@ class WordLevelDiff extends MappedDiff {
 
 		foreach ($this->edits as $edit) {
 			if ($edit->type == 'copy')
-				$closing->addWords($edit->closing);
+			$closing->addWords($edit->closing);
 			elseif ($edit->closing)
-				$closing->addWords($edit->closing, 'ins');
+			$closing->addWords($edit->closing, 'ins');
 		}
 		$lines = $closing->getLines();
 		wfProfileOut( __METHOD__ );
@@ -1965,24 +2044,24 @@ class TableDiffFormatter extends DiffFormatter {
 	function _added( $lines ) {
 		foreach ($lines as $line) {
 			echo '<tr>' . $this->emptyLine() .
-				$this->addedLine( '<ins class="diffchange">' .
-					htmlspecialchars ( $line ) . '</ins>' ) . "</tr>\n";
+			$this->addedLine( '<ins class="diffchange">' .
+			htmlspecialchars ( $line ) . '</ins>' ) . "</tr>\n";
 		}
 	}
 
 	function _deleted($lines) {
 		foreach ($lines as $line) {
 			echo '<tr>' . $this->deletedLine( '<del class="diffchange">' .
-				htmlspecialchars ( $line ) . '</del>' ) .
-			  $this->emptyLine() . "</tr>\n";
+			htmlspecialchars ( $line ) . '</del>' ) .
+			$this->emptyLine() . "</tr>\n";
 		}
 	}
 
 	function _context( $lines ) {
 		foreach ($lines as $line) {
 			echo '<tr>' .
-				$this->contextLine( htmlspecialchars ( $line ) ) .
-				$this->contextLine( htmlspecialchars ( $line ) ) . "</tr>\n";
+			$this->contextLine( htmlspecialchars ( $line ) ) .
+			$this->contextLine( htmlspecialchars ( $line ) ) . "</tr>\n";
 		}
 	}
 
@@ -1999,12 +2078,12 @@ class TableDiffFormatter extends DiffFormatter {
 		while ( $line = array_shift( $del ) ) {
 			$aline = array_shift( $add );
 			echo '<tr>' . $this->deletedLine( $line ) .
-				$this->addedLine( $aline ) . "</tr>\n";
+			$this->addedLine( $aline ) . "</tr>\n";
 		}
 		foreach ($add as $line) {	# If any leftovers
 			echo '<tr>' . $this->emptyLine() .
-				$this->addedLine( $line ) . "</tr>\n";
+			$this->addedLine( $line ) . "</tr>\n";
 		}
 		wfProfileOut( __METHOD__ );
 	}
-}
+}
\ No newline at end of file