Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1) actually do what it says (only use external diff when set in user prefs)

Browse source 
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)
This commit is contained in:
Erik Moeller 2005-04-13 21:06:09 +00:00
parent da025175fc
commit 8a3c7e3e89
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/DifferenceEngine.php
View file

@ -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=<<<CONTROL
[Process]
Type=Diff text
Engine=MediaWiki
Script={$wgServer}{$wgScript}
Special namespace={$special}
[File]
Extension=wiki