From 97a9c65895f4cc519434b5d61c90800aa30d36e2 Mon Sep 17 00:00:00 2001 From: Ori Livneh Date: Fri, 3 Apr 2015 11:07:39 -0700 Subject: [PATCH] PHPCS lint fixes Change-Id: I16288db03f34439bdb16940a86720d2511f46467 --- includes/GlobalFunctions.php | 6 ++++-- includes/MediaWiki.php | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 24a3c332db..b2a2e3db4f 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -3063,7 +3063,8 @@ function wfMerge( $old, $mine, $yours, &$result ) { fclose( $yourtextFile ); # Check for a conflict - $cmd = wfEscapeShellArg( $wgDiff3, '-a', '--overlap-only', $mytextName, $oldtextName, $yourtextName ); + $cmd = wfEscapeShellArg( $wgDiff3, '-a', '--overlap-only', $mytextName, + $oldtextName, $yourtextName ); $handle = popen( $cmd, 'r' ); if ( fgets( $handle, 1024 ) ) { @@ -3074,7 +3075,8 @@ function wfMerge( $old, $mine, $yours, &$result ) { pclose( $handle ); # Merge differences - $cmd = wfEscapeShellArg( $wgDiff3, '-a', '-e', '--merge', $mytextName, $oldtextName, $yourtextName ); + $cmd = wfEscapeShellArg( $wgDiff3, '-a', '-e', '--merge', $mytextName, + $oldtextName, $yourtextName ); $handle = popen( $cmd, 'r' ); $result = ''; do { diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index c4af16d6af..3f2cb6286c 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -663,7 +663,12 @@ class MediaWiki { } $url = wfAppendQuery( wfScript( 'index' ), $query ); - $req = "POST $url HTTP/1.1\r\nHost: {$info['host']}\r\nConnection: Close\r\nContent-Length: 0\r\n\r\n"; + $req = ( + "POST $url HTTP/1.1\r\n" . + "Host: {$info['host']}\r\n" . + "Connection: Close\r\n" . + "Content-Length: 0\r\n\r\n" + ); $runJobsLogger->info( "Running $n job(s) via '$url'" ); // Send a cron API request to be performed in the background. -- 2.20.1