| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1018,8 +1018,7 @@ |
| 1019 | 1019 | |
| 1020 | 1020 | /** |
| 1021 | 1021 | * Can $wgUser perform $action on this page? |
| 1022 | | - * This skips potentially expensive cascading permission checks |
| 1023 | | - * as well as avoids expensive error formatting |
| | 1022 | + * This skips potentially expensive cascading permission checks. |
| 1024 | 1023 | * |
| 1025 | 1024 | * Suitable for use for nonessential UI controls in common cases, but |
| 1026 | 1025 | * _not_ for functional access control. |
| — | — | @@ -1204,14 +1203,8 @@ |
| 1205 | 1204 | } |
| 1206 | 1205 | } elseif( !$user->isAllowed( $action ) ) { |
| 1207 | 1206 | $return = null; |
| 1208 | | - |
| 1209 | | - // We avoid expensive display logic for quickUserCan's and such |
| 1210 | | - $groups = false; |
| 1211 | | - if (!$short) { |
| 1212 | | - $groups = array_map( array( 'User', 'makeGroupLinkWiki' ), |
| 1213 | | - User::getGroupsWithPermission( $action ) ); |
| 1214 | | - } |
| 1215 | | - |
| | 1207 | + $groups = array_map( array( 'User', 'makeGroupLinkWiki' ), |
| | 1208 | + User::getGroupsWithPermission( $action ) ); |
| 1216 | 1209 | if( $groups ) { |
| 1217 | 1210 | $return = array( 'badaccess-groups', |
| 1218 | 1211 | array( implode( ', ', $groups ), count( $groups ) ) ); |
| Property changes on: trunk/phase3/includes/specials/SpecialCreatePage.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1219 | 1212 | - |