* Remove useless ?> in Diff.php
* Only load that file when necessary and use full path to include it * Set missing svn:eol-style property
This commit is contained in:
parent
7d4dbee3f9
commit
50042028d5
2 changed files with 2 additions and 5 deletions
|
|
@ -469,4 +469,3 @@ class InLcs {
|
|||
}
|
||||
|
||||
}
|
||||
?>
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue