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

Fix #1570 : php 4.2.x error on conflict merging

Browse source
This commit is contained in:
Antoine Musso 2005-03-04 12:55:37 +00:00
parent f4c6d815fd
commit e24061460b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/GlobalFunctions.php
View file

@ -783,7 +783,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
wfEscapeShellArg( $yourtextName );
$handle = popen( $cmd, 'r' );
if( fgets( $handle ) ){
if( fgets( $handle, 1024 ) ){
$conflict = true;
} else {
$conflict = false;