From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 29 Jan 2009 16:26:35 +0000 (+0000)
Subject: Short-circuit block check
X-Git-Tag: 1.31.0-rc.0~43133
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%22http:/wikimediafoundation.org/fundraising/%7B%7B%20url_for%28%27user_settings%27%2C%20userid=session.userid%29%20%7D%7D?a=commitdiff_plain;h=773163a69a027ef240aef41acd5a8655bfee07e8;p=lhc%2Fweb%2Fwiklou.git

Short-circuit block check
---

diff --git a/includes/Title.php b/includes/Title.php
index fea8588bd7..cfe7197c53 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1088,7 +1088,7 @@ class Title {
 		}
 
 		// Edit blocks should not affect reading. Account creation blocks handled at userlogin.
-		if ( $user->isBlockedFrom( $this ) && $action != 'read' && $action != 'createaccount' ) {
+		if ( $action != 'read' && $action != 'createaccount' && $user->isBlockedFrom( $this ) ) {
 			$block = $user->mBlock;
 
 			// This is from OutputPage::blockedPage