dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f4c6d81
)
Fix #1570 : php 4.2.x error on conflict merging
author
Antoine Musso
<hashar@users.mediawiki.org>
Fri, 4 Mar 2005 12:55:37 +0000
(12:55 +0000)
committer
Antoine Musso
<hashar@users.mediawiki.org>
Fri, 4 Mar 2005 12:55:37 +0000
(12:55 +0000)
includes/GlobalFunctions.php
patch
|
blob
|
history
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
f57b77d
..
ea209c9
100644
(file)
--- 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;