From: Antoine Musso <hashar@users.mediawiki.org>
Date: Fri, 4 Mar 2005 12:55:37 +0000 (+0000)
Subject: Fix #1570 : php 4.2.x error on conflict merging
X-Git-Tag: 1.5.0alpha1~675
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=e24061460b83e876b1fa62078db9cc5945802779;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index f57b77d5aa..ea209c92eb 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -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;