MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274907
Change subject: Ditch support for original wikidiff
......................................................................
Ditch support for original wikidiff
It's been unmaintained for a while and does not support
various languages adequately.
Also, document $wgExternalDiffEngine.
Change-Id: Ia8aeffd79d550fb7a1a7121456940446eea8bd4f
---
M includes/DefaultSettings.php
M includes/diff/DifferenceEngine.php
2 files changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/274907/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e7c8651..3257e39 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -7744,7 +7744,11 @@
*/
/**
- * Name of the external diff engine to use
+ * Name of the external diff engine to use. Supported values:
+ * * false: default PHP implementation, DairikiDiff
+ * * 'wikidiff2': Wikimedia's fast difference engine implemented as a PHP/HHVM
module;
+ * * 'wikidiff3': for newer PHP-based difference engine
+ * * any other string is treated as a path to external diff executable
*/
$wgExternalDiffEngine = false;
diff --git a/includes/diff/DifferenceEngine.php
b/includes/diff/DifferenceEngine.php
index 99eefc0..a32e7c0 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -847,16 +847,6 @@
$otext = str_replace( "\r\n", "\n", $otext );
$ntext = str_replace( "\r\n", "\n", $ntext );
- if ( $wgExternalDiffEngine == 'wikidiff' && function_exists(
'wikidiff_do_diff' ) ) {
- # For historical reasons, external diff engine expects
- # input text to be HTML-escaped already
- $otext = htmlspecialchars( $wgContLang->segmentForDiff(
$otext ) );
- $ntext = htmlspecialchars( $wgContLang->segmentForDiff(
$ntext ) );
-
- return $wgContLang->unsegmentForDiff( wikidiff_do_diff(
$otext, $ntext, 2 ) ) .
- $this->debug( 'wikidiff1' );
- }
-
if ( $wgExternalDiffEngine == 'wikidiff2' && function_exists(
'wikidiff2_do_diff' ) ) {
# Better external diff engine, the 2 may some day be
dropped
# This one does the escaping and segmenting itself
--
To view, visit https://gerrit.wikimedia.org/r/274907
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8aeffd79d550fb7a1a7121456940446eea8bd4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
