| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -147,8 +147,12 @@ |
| 148 | 148 | |
| 149 | 149 | # Try user block |
| 150 | 150 | if ( $user ) { |
| 151 | | - $res = $db->resultObject( $db->select( 'ipblocks', '*', array( 'ipb_user' => $user ), |
| 152 | | - __METHOD__ ) ); |
| | 151 | + $res = $db->resultObject( $db->select( |
| | 152 | + 'ipblocks', |
| | 153 | + '*', |
| | 154 | + array( 'ipb_user' => $user ), |
| | 155 | + __METHOD__ |
| | 156 | + ) ); |
| 153 | 157 | |
| 154 | 158 | if ( $this->loadFromResult( $res, $killExpired ) ) { |
| 155 | 159 | return true; |
| — | — | @@ -160,7 +164,12 @@ |
| 161 | 165 | # Slightly tricky while handling killExpired as well |
| 162 | 166 | if ( $address !== '' ) { |
| 163 | 167 | $conds = array( 'ipb_address' => $address, 'ipb_auto' => 0 ); |
| 164 | | - $res = $db->resultObject( $db->select( 'ipblocks', '*', $conds, __METHOD__, $options ) ); |
| | 168 | + $res = $db->resultObject( $db->select( |
| | 169 | + 'ipblocks', |
| | 170 | + '*', |
| | 171 | + $conds, |
| | 172 | + __METHOD__ |
| | 173 | + ) ); |
| 165 | 174 | |
| 166 | 175 | if ( $this->loadFromResult( $res, $killExpired ) ) { |
| 167 | 176 | if ( $user && $this->mAnonOnly ) { |
| — | — | @@ -200,7 +209,12 @@ |
| 201 | 210 | $conds['ipb_anon_only'] = 0; |
| 202 | 211 | } |
| 203 | 212 | |
| 204 | | - $res = $db->resultObject( $db->select( 'ipblocks', '*', $conds, __METHOD__, $options ) ); |
| | 213 | + $res = $db->resultObject( $db->select( |
| | 214 | + 'ipblocks', |
| | 215 | + '*', |
| | 216 | + $conds, |
| | 217 | + __METHOD__ |
| | 218 | + ) ); |
| 205 | 219 | |
| 206 | 220 | if ( $this->loadFromResult( $res, $killExpired ) ) { |
| 207 | 221 | return true; |