From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 15 Aug 2008 16:51:46 +0000 (+0000)
Subject: Fixes for r39406:
X-Git-Tag: 1.31.0-rc.0~45886
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=e8aadacc7dceb7564e17a193d09cd8238eb87658;p=lhc%2Fweb%2Fwiklou.git

Fixes for r39406:
* Set missing properties svn:eol-style and svn:mime-type
* Use auto loader if possible
* Added $wgEnableHtmlDiff to DefaultSettings.php (todo: fix description of this setting)
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 10cf65c369..ab42a19b74 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -32,6 +32,7 @@ $wgAutoloadLocalClasses = array(
 	'ConcatenatedGzipHistoryBlob' => 'includes/HistoryBlob.php',
 	'ConstantDependency' => 'includes/CacheDependency.php',
 	'DBABagOStuff' => 'includes/BagOStuff.php',
+	'DelegatingContentHandler' => 'includes/HTMLDiff.php',
 	'DependencyWrapper' => 'includes/CacheDependency.php',
 	'_DiffEngine' => 'includes/DifferenceEngine.php',
 	'DifferenceEngine' => 'includes/DifferenceEngine.php',
@@ -57,6 +58,7 @@ $wgAutoloadLocalClasses = array(
 	'DumpOutput' => 'includes/Export.php',
 	'DumpPipeOutput' => 'includes/Export.php',
 	'eAccelBagOStuff' => 'includes/BagOStuff.php',
+	'EchoingContentHandler' => 'includes/HTMLDiff.php',
 	'EditPage' => 'includes/EditPage.php',
 	'EmaillingJob' => 'includes/EmaillingJob.php',
 	'EmailNotification' => 'includes/UserMailer.php',
@@ -90,7 +92,9 @@ $wgAutoloadLocalClasses = array(
 	'HistoryBlobStub' => 'includes/HistoryBlob.php',
 	'HTMLCacheUpdate' => 'includes/HTMLCacheUpdate.php',
 	'HTMLCacheUpdateJob' => 'includes/HTMLCacheUpdate.php',
+	'HTMLDiffer' => 'includes/HTMLDiff.php',
 	'HTMLFileCache' => 'includes/HTMLFileCache.php',
+	'HTMLOutput' => 'includes/HTMLDiff.php',
 	'Http' => 'includes/HttpFunctions.php',
 	'_HWLDF_WordAccumulator' => 'includes/DifferenceEngine.php',
 	'ImageGallery' => 'includes/ImageGallery.php',
@@ -150,6 +154,7 @@ $wgAutoloadLocalClasses = array(
 	'ProtectionForm' => 'includes/ProtectionForm.php',
 	'QueryPage' => 'includes/QueryPage.php',
 	'QuickTemplate' => 'includes/SkinTemplate.php',
+	'RangeDifference' => 'includes/DifferenceEngine.php',
 	'RawPage' => 'includes/RawPage.php',
 	'RCCacheEntry' => 'includes/ChangesList.php',
 	'RecentChange' => 'includes/RecentChange.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9a1ae62910..7d3489a8d8 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2377,6 +2377,9 @@ $wgMaxTocLevel = 999;
 /** Name of the external diff engine to use */
 $wgExternalDiffEngine = false;
 
+/** Whether to use inline diff */
+$wgEnableHtmlDiff = false;
+
 /** Use RC Patrolling to check for vandalism */
 $wgUseRCPatrol = true;
 
diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index c02eab2a33..a49fdba031 100644
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -327,13 +327,11 @@ CONTROL;
 
 
 	function renderHtmlDiff() {
-		global $wgOut, $IP;
+		global $wgOut;
 		wfProfileIn( __METHOD__ );
 
 		$this->showDiffStyle();
 
-		require_once( "$IP/includes/HTMLDiff.php" );
-
 		#add deleted rev tag if needed
 		if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
 			$wgOut->addWikiMsg( 'rev-deleted-text-permission' );