From 408181b29ec5b3b77db4f2a2853a4c2585aceb5a Mon Sep 17 00:00:00 2001
From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sat, 19 Mar 2011 17:36:10 +0000
Subject: [PATCH] Follow-up r84336: break some long lines

---
 includes/Block.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/includes/Block.php b/includes/Block.php
index 829650cde8..e826a680aa 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -147,8 +147,12 @@ class Block {
 
 		# Try user block
 		if ( $user ) {
-			$res = $db->resultObject( $db->select( 'ipblocks', '*', array( 'ipb_user' => $user ),
-				__METHOD__ ) );
+			$res = $db->resultObject( $db->select(
+				'ipblocks',
+				'*',
+				array( 'ipb_user' => $user ),
+				__METHOD__
+			) );
 
 			if ( $this->loadFromResult( $res, $killExpired ) ) {
 				return true;
@@ -160,7 +164,12 @@ class Block {
 		# Slightly tricky while handling killExpired as well
 		if ( $address !== '' ) {
 			$conds = array( 'ipb_address' => $address, 'ipb_auto' => 0 );
-			$res = $db->resultObject( $db->select( 'ipblocks', '*', $conds, __METHOD__, $options ) );
+			$res = $db->resultObject( $db->select(
+				'ipblocks',
+				'*',
+				$conds,
+				__METHOD__
+			) );
 
 			if ( $this->loadFromResult( $res, $killExpired ) ) {
 				if ( $user && $this->mAnonOnly ) {
@@ -200,7 +209,12 @@ class Block {
 				$conds['ipb_anon_only'] = 0;
 			}
 
-			$res = $db->resultObject( $db->select( 'ipblocks', '*', $conds, __METHOD__, $options ) );
+			$res = $db->resultObject( $db->select(
+				'ipblocks',
+				'*',
+				$conds,
+				__METHOD__
+			) );
 
 			if ( $this->loadFromResult( $res, $killExpired ) ) {
 				return true;
-- 
2.20.1