From 50042028d5b9f05a50ff196b24e8b32d4542b27b Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Tue, 5 Aug 2008 21:10:06 +0000 Subject: [PATCH] * Remove useless ?> in Diff.php * Only load that file when necessary and use full path to include it * Set missing svn:eol-style property --- includes/Diff.php | 1 - includes/DifferenceEngine.php | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/includes/Diff.php b/includes/Diff.php index 4a6f117374..a1aa805a0f 100644 --- a/includes/Diff.php +++ b/includes/Diff.php @@ -469,4 +469,3 @@ class InLcs { } } -?> \ No newline at end of file diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php index 3a75ed1feb..1df4fea583 100644 --- a/includes/DifferenceEngine.php +++ b/includes/DifferenceEngine.php @@ -2,10 +2,6 @@ /** * @defgroup DifferenceEngine DifferenceEngine */ -global $wgExternalDiffEngine; -if($wgExternalDiffEngine == 'wikidiff3'){ - require_once( 'Diff.php' ); -} /** * Constant to indicate diff cache compatibility. @@ -934,6 +930,8 @@ class _DiffEngine { if($wgExternalDiffEngine == 'wikidiff3'){ // wikidiff3 + global $IP; + require_once( "$IP/includes/Diff.php" ); list($this->xchanged, $this->ychanged) = wikidiff3_diff($from_lines, $to_lines, TRUE, 100000); }else{ // old diff -- 2.20.1