From 8a3c7e3e8913e2040c84b1466a9a73c5e31a7047 Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Wed, 13 Apr 2005 21:06:09 +0000 Subject: [PATCH] 1) actually do what it says (only use external diff when set in user prefs) 2) fix metafile (Special namespace is transferred, it's up to the script whether it wants to log in, not really needed for diffs, though perhaps if rollback etc. is to be implemented) --- includes/DifferenceEngine.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php index c871eb949f..c6f58d2303 100644 --- a/includes/DifferenceEngine.php +++ b/includes/DifferenceEngine.php @@ -72,17 +72,19 @@ class DifferenceEngine { # If external diffs are enabled both globally and for the user, # we'll use the application/x-external-editor interface to call # an external diff tool like kompare, kdiff3, etc. - if($wgUseExternalEditor) { - global $wgInputEncoding,$wgServer,$wgScript; + if($wgUseExternalEditor && $wgUser->getOption('externaldiff')) { + global $wgInputEncoding,$wgServer,$wgScript,$wgLang; $wgOut->disable(); header ( "Content-type: application/x-external-editor; charset=".$wgInputEncoding ); - $url1=$wgTitle->getFullURL("action=raw&oldid=".$this->mOldid); + $url1=$wgTitle->getFullURL("action=raw&oldid=".$this->mOldid); $url2=$wgTitle->getFullURL("action=raw&oldid=".$this->mNewid); + $special=$wgLang->getNsText(NS_SPECIAL); $control=<<