* Remove useless ?> in Diff.php

* Only load that file when necessary and use full path to include it
* Set missing svn:eol-style property

diff --git a/includes/Diff.php b/includes/Diff.php
index 4a6f117..a1aa805 100644 (file)
--- 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 3a75ed1..1df4fea 100644 (file)
--- 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