From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Wed, 24 Nov 2010 19:52:59 +0000 (+0000)
Subject: followup r65504 — actually check that we hav errors before returnning from checkUserB... 
X-Git-Tag: 1.31.0-rc.0~33743
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=c68cf0c28a7c48d13b6121ab888c24ec1a2fc6cb;p=lhc%2Fweb%2Fwiklou.git

followup r65504 — actually check that we hav errors before returnning from checkUserBlock when short circuited.
---

diff --git a/includes/Title.php b/includes/Title.php
index da282fd972..13ea7d909c 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1475,7 +1475,7 @@ class Title {
 	 * @see checkQuickPermissions for parameter information
 	 */
 	private function checkUserBlock( $action, $user, $errors, $doExpensiveQueries, $short ) {
-		if( $short ) {
+		if( $short && count( $errors ) > 0 ) {
 			return $errors;
 		}