From: Tim Starling <tstarling@wikimedia.org>
Date: Thu, 11 Dec 2014 03:54:37 +0000 (+1100)
Subject: Fix parenthesis placement in multi-line condition
X-Git-Tag: 1.31.0-rc.0~12999
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=90a3418cf27021e1c56323e453ffac2b0e49f9ea;p=lhc%2Fweb%2Fwiklou.git

Fix parenthesis placement in multi-line condition

After talking with the folks in #mediawiki-core, I decided that I can
put up with it, under protest, on the basis that it's arguably
consistent with PSR-2.

Change-Id: I5f0c0f8f0172674797970d306efe6439ce1c2b67
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a30a5eab34..2155c1b237 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1434,8 +1434,8 @@ class EditPage {
 	protected function runPostMergeFilters( Content $content, Status $status, User $user ) {
 		// Run old style post-section-merge edit filter
 		if ( !ContentHandler::runLegacyHooks( 'EditFilterMerged',
-			array( $this, $content, &$this->hookError, $this->summary ) ) )
-		{
+			array( $this, $content, &$this->hookError, $this->summary ) )
+		) {
 			# Error messages etc. could be handled within the hook...
 			$status->fatal( 'hookaborted' );
 			$status->value = self::AS_HOOK_ERROR;
@@ -1450,8 +1450,8 @@ class EditPage {
 		// Run new style post-section-merge edit filter
 		if ( !Hooks::run( 'EditFilterMergedContent',
 				array( $this->mArticle->getContext(), $content, $status, $this->summary,
-				$user, $this->minoredit ) ) )
-		{
+				$user, $this->minoredit ) )
+		) {
 			# Error messages etc. could be handled within the hook...
 			if ( $status->isGood() ) {
 				$status->fatal( 'hookaborted' );