Merge "Add action/user tracking to html cache purge jobs"

[lhc/web/wiklou.git] / includes / diff / DifferenceEngine.php

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 6a2837b..813ee08 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -902,6 +902,7 @@ class DifferenceEngine extends ContextSource {
         * @param string $otext Old text, must be already segmented
         * @param string $ntext New text, must be already segmented
         * @return bool|string
+        * @throws Exception
         */
        protected function textDiff( $otext, $ntext ) {
                global $wgExternalDiffEngine, $wgContLang;
@@ -927,7 +928,7 @@ class DifferenceEngine extends ContextSource {
                        $wikidiff2Version = phpversion( 'wikidiff2' );
                        if (
                                $wikidiff2Version !== false &&
-                               version_compare( $wikidiff2Version, '0.3', '>=' )
+                               version_compare( $wikidiff2Version, '1.5.0', '>=' )
                        ) {
                                $text = wikidiff2_do_diff(
                                        $otext,
@@ -994,6 +995,7 @@ class DifferenceEngine extends ContextSource {
                $diffs = new Diff( $ota, $nta );
                $formatter = new TableDiffFormatter();
                $difftext = $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) );
+               $difftext .= $this->debug( 'native PHP' );
 
                return $difftext;
        }