X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2Fdiff%2FDifferenceEngine.php;h=813ee080e21b23fea5f88fb7a30fce57405691a0;hb=b5370206ff602728c08403f14756d4339bf0a708;hp=6a2837b43a0448607e18f45e090dbe7e2966e3c3;hpb=7ff01f46c40975098590290918f98893c7f65118;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 6a2837b43a..813ee080e2 100644
--- 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;
 	}