From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 4 May 2009 08:57:33 +0000 (+0000)
Subject: Reverted r48983: obsolete since r48989, replaced by less intrusive optimisations.
X-Git-Tag: 1.31.0-rc.0~41895
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=430a2a6ea63b5adc6fdab8a9f09fe5a508b7ed55;p=lhc%2Fweb%2Fwiklou.git

Reverted r48983: obsolete since r48989, replaced by less intrusive optimisations.
---

diff --git a/includes/Title.php b/includes/Title.php
index 3da588874d..f4c4641fe4 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1018,8 +1018,7 @@ class Title {
 
 	/**
 	 * Can $wgUser perform $action on this page?
-	 * This skips potentially expensive cascading permission checks
-	 * as well as avoids expensive error formatting
+	 * This skips potentially expensive cascading permission checks.
 	 *
 	 * Suitable for use for nonessential UI controls in common cases, but
 	 * _not_ for functional access control.
@@ -1204,14 +1203,8 @@ class Title {
 			}
 		} elseif( !$user->isAllowed( $action ) ) {
 			$return = null;
-			
-			// We avoid expensive display logic for quickUserCan's and such
-			$groups = false; 
-			if (!$short) {
-				$groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
-					User::getGroupsWithPermission( $action ) );
-			} 
-			
+			$groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
+				User::getGroupsWithPermission( $action ) );
 			if( $groups ) {
 				$return = array( 'badaccess-groups',
 					array( implode( ', ', $groups ), count( $groups ) ) );