From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 3 Apr 2004 07:49:26 +0000 (+0000)
Subject: more debugging rubbish, sorry
X-Git-Tag: 1.3.0beta1~624
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=5104b9f29ce63b47b6e889543407dd6148b6502f;p=lhc%2Fweb%2Fwiklou.git

more debugging rubbish, sorry
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d17d6259f1..81739bafef 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -804,7 +804,6 @@ function wfMerge( $old, $mine, $yours, &$result ){
 	fwrite( $yourtextFile, $yours ); fclose( $yourtextFile );
 
 	# Check for a conflict
-	#$cmd = "{$wgDiff3} -a --overlap-only $mytextName $oldtextName $yourtextName";
     $cmd = wfEscapeShellArg( $wgDiff3 ) . " -a --overlap-only " .
       wfEscapeShellArg( $mytextName ) . " " .
       wfEscapeShellArg( $oldtextName ) . " " .
@@ -819,7 +818,6 @@ function wfMerge( $old, $mine, $yours, &$result ){
 	pclose( $handle );
 
 	# Merge differences
-	#$cmd = "{$wgDiff3} -a -e --merge $mytextName $oldtextName $yourtextName";
 	$cmd = wfEscapeShellArg( $wgDiff3 ) . " -a -e --merge " . 
 	  wfEscapeShellArg( $mytextName, $oldtextName, $yourtextName );
 	$handle = popen( $cmd, "r" );
@@ -832,7 +830,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
 		$result .= $data;
 	} while ( true );
 	pclose( $handle );
-	#unlink( $mytextName ); unlink( $oldtextName ); unlink( $yourtextName );
+	unlink( $mytextName ); unlink( $oldtextName ); unlink( $yourtextName );
 	return ! $conflict;
 }