| Property changes on: trunk/phase3/skins/common/images/diffunderline.gif |
| ___________________________________________________________________ |
| Name: svn:mime-type |
| 1 | 1 | + image/gif |
| Property changes on: trunk/phase3/includes/HTMLDiff.php |
| ___________________________________________________________________ |
| Name: svn:eol-style |
| 2 | 2 | + native |
| Index: trunk/phase3/includes/AutoLoader.php |
| — | — | @@ -32,6 +32,7 @@ |
| 33 | 33 | 'ConcatenatedGzipHistoryBlob' => 'includes/HistoryBlob.php', |
| 34 | 34 | 'ConstantDependency' => 'includes/CacheDependency.php', |
| 35 | 35 | 'DBABagOStuff' => 'includes/BagOStuff.php', |
| | 36 | + 'DelegatingContentHandler' => 'includes/HTMLDiff.php', |
| 36 | 37 | 'DependencyWrapper' => 'includes/CacheDependency.php', |
| 37 | 38 | '_DiffEngine' => 'includes/DifferenceEngine.php', |
| 38 | 39 | 'DifferenceEngine' => 'includes/DifferenceEngine.php', |
| — | — | @@ -57,6 +58,7 @@ |
| 58 | 59 | 'DumpOutput' => 'includes/Export.php', |
| 59 | 60 | 'DumpPipeOutput' => 'includes/Export.php', |
| 60 | 61 | 'eAccelBagOStuff' => 'includes/BagOStuff.php', |
| | 62 | + 'EchoingContentHandler' => 'includes/HTMLDiff.php', |
| 61 | 63 | 'EditPage' => 'includes/EditPage.php', |
| 62 | 64 | 'EmaillingJob' => 'includes/EmaillingJob.php', |
| 63 | 65 | 'EmailNotification' => 'includes/UserMailer.php', |
| — | — | @@ -90,7 +92,9 @@ |
| 91 | 93 | 'HistoryBlobStub' => 'includes/HistoryBlob.php', |
| 92 | 94 | 'HTMLCacheUpdate' => 'includes/HTMLCacheUpdate.php', |
| 93 | 95 | 'HTMLCacheUpdateJob' => 'includes/HTMLCacheUpdate.php', |
| | 96 | + 'HTMLDiffer' => 'includes/HTMLDiff.php', |
| 94 | 97 | 'HTMLFileCache' => 'includes/HTMLFileCache.php', |
| | 98 | + 'HTMLOutput' => 'includes/HTMLDiff.php', |
| 95 | 99 | 'Http' => 'includes/HttpFunctions.php', |
| 96 | 100 | '_HWLDF_WordAccumulator' => 'includes/DifferenceEngine.php', |
| 97 | 101 | 'ImageGallery' => 'includes/ImageGallery.php', |
| — | — | @@ -150,6 +154,7 @@ |
| 151 | 155 | 'ProtectionForm' => 'includes/ProtectionForm.php', |
| 152 | 156 | 'QueryPage' => 'includes/QueryPage.php', |
| 153 | 157 | 'QuickTemplate' => 'includes/SkinTemplate.php', |
| | 158 | + 'RangeDifference' => 'includes/DifferenceEngine.php', |
| 154 | 159 | 'RawPage' => 'includes/RawPage.php', |
| 155 | 160 | 'RCCacheEntry' => 'includes/ChangesList.php', |
| 156 | 161 | 'RecentChange' => 'includes/RecentChange.php', |
| Index: trunk/phase3/includes/DifferenceEngine.php |
| — | — | @@ -327,13 +327,11 @@ |
| 328 | 328 | |
| 329 | 329 | |
| 330 | 330 | function renderHtmlDiff() { |
| 331 | | - global $wgOut, $IP; |
| | 331 | + global $wgOut; |
| 332 | 332 | wfProfileIn( __METHOD__ ); |
| 333 | 333 | |
| 334 | 334 | $this->showDiffStyle(); |
| 335 | 335 | |
| 336 | | - require_once( "$IP/includes/HTMLDiff.php" ); |
| 337 | | - |
| 338 | 336 | #add deleted rev tag if needed |
| 339 | 337 | if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) { |
| 340 | 338 | $wgOut->addWikiMsg( 'rev-deleted-text-permission' ); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2377,6 +2377,9 @@ |
| 2378 | 2378 | /** Name of the external diff engine to use */ |
| 2379 | 2379 | $wgExternalDiffEngine = false; |
| 2380 | 2380 | |
| | 2381 | +/** Whether to use inline diff */ |
| | 2382 | +$wgEnableHtmlDiff = false; |
| | 2383 | + |
| 2381 | 2384 | /** Use RC Patrolling to check for vandalism */ |
| 2382 | 2385 | $wgUseRCPatrol = true; |
| 2383 | 2386 | |