X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=1a33b76357aad9081d23436a4393eafbee7f2f08;hb=544122a6c2dc7e7e383af8ebabc2f2dd3977069a;hp=404d115280b200aa8447050ad246bd7a135b15ad;hpb=bb6fbc171319b0e467cb07d21422d82569a80903;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 404d115280..1a33b76357 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2225,7 +2225,23 @@ function wfPercent( $nr, $acc = 2, $round = true ) {
  * @return bool
  */
 function wfIniGetBool( $setting ) {
-	$val = strtolower( ini_get( $setting ) );
+	return wfStringToBool( ini_get( $setting ) );
+}
+
+/**
+ * Convert string value to boolean, when the following are interpreted as true:
+ * - on
+ * - true
+ * - yes
+ * - Any number, except 0
+ * All other strings are interpreted as false.
+ *
+ * @param string $val
+ * @return bool
+ * @since 1.31
+ */
+function wfStringToBool( $val ) {
+	$val = strtolower( $val );
 	// 'on' and 'true' can't have whitespace around them, but '1' can.
 	return $val == 'on'
 		|| $val == 'true'
@@ -2388,9 +2404,10 @@ function wfShellWikiCmd( $script, array $parameters = [], array $options = [] )
  * @param string $mine
  * @param string $yours
  * @param string &$result
+ * @param string &$mergeAttemptResult
  * @return bool
  */
-function wfMerge( $old, $mine, $yours, &$result ) {
+function wfMerge( $old, $mine, $yours, &$result, &$mergeAttemptResult = null ) {
 	global $wgDiff3;
 
 	# This check may also protect against code injection in
@@ -2426,13 +2443,18 @@ function wfMerge( $old, $mine, $yours, &$result ) {
 		$oldtextName, $yourtextName );
 	$handle = popen( $cmd, 'r' );
 
-	if ( fgets( $handle, 1024 ) ) {
-		$conflict = true;
-	} else {
-		$conflict = false;
-	}
+	$mergeAttemptResult = '';
+	do {
+		$data = fread( $handle, 8192 );
+		if ( strlen( $data ) == 0 ) {
+			break;
+		}
+		$mergeAttemptResult .= $data;
+	} while ( true );
 	pclose( $handle );
 
+	$conflict = $mergeAttemptResult !== '';
+
 	# Merge differences
 	$cmd = Shell::escape( $wgDiff3, '-a', '-e', '--merge', $mytextName,
 		$oldtextName, $yourtextName );