From e24061460b83e876b1fa62078db9cc5945802779 Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Fri, 4 Mar 2005 12:55:37 +0000 Subject: [PATCH] Fix #1570 : php 4.2.x error on conflict merging --- includes/GlobalFunctions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.20.1