Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Replace deprecated PermissionManager::groupHasPermission"

Browse source
This commit is contained in:
jenkins-bot 2022-12-14 21:53:23 +00:00 committed by Gerrit Code Review
commit a3470d3cff
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/OutputPage.php
View file

@ -2981,7 +2981,7 @@ class OutputPage extends ContextSource {
*/
public function showPermissionsErrorPage( array $errors, $action = null ) {
$services = MediaWikiServices::getInstance();
$permissionManager = $services->getPermissionManager();
$groupPermissionsLookup = $services->getGroupPermissionsLookup();
foreach ( $errors as $key => $error ) {
$errors[$key] = (array)$error;
}
@ -2995,8 +2995,8 @@ class OutputPage extends ContextSource {
if ( in_array( $action, [ 'read', 'edit', 'createpage', 'createtalk', 'upload' ] )
&& $this->getUser()->isAnon() && count( $errors ) == 1 && isset( $errors[0][0] )
&& ( $errors[0][0] == 'badaccess-groups' || $errors[0][0] == 'badaccess-group0' )
&& ( $permissionManager->groupHasPermission( 'user', $action )
|| $permissionManager->groupHasPermission( 'autoconfirmed', $action ) )
&& ( $groupPermissionsLookup->groupHasPermission( 'user', $action )
|| $groupPermissionsLookup->groupHasPermission( 'autoconfirmed', $action ) )
) {
$displayReturnto = null;

4
includes/skins/SkinTemplate.php
View file

@ -412,7 +412,7 @@ class SkinTemplate extends Skin {
$pageurl = $title->getLocalURL();
$services = MediaWikiServices::getInstance();
$authManager = $services->getAuthManager();
$permissionManager = $services->getPermissionManager();
$groupPermissionsLookup = $services->getGroupPermissionsLookup();
$returnto = $this->getReturnToParam();
/* set up the default links for the personal toolbar */
@ -521,7 +521,7 @@ class SkinTemplate extends Skin {
if ( $authManager->canAuthenticateNow() ) {
// TODO: easy way to get anon authority
$key = $permissionManager->groupHasPermission( '*', 'read' )
$key = $groupPermissionsLookup->groupHasPermission( '*', 'read' )
? 'login'
: 'login-private';
$personal_urls[$key] = $login_url;