X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FMovePage.php;h=4180e3293ad097121718f079fd60675e321458d4;hb=35ea4313e51ffa087546f3929b7a6b7eccd428fa;hp=a63eeaebda7f281f15130041685e8b2961eaf8e6;hpb=285cbfde618577a4d8338edfa0205d9bf31d43ab;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/MovePage.php b/includes/MovePage.php index a63eeaebda..4180e3293a 100644 --- a/includes/MovePage.php +++ b/includes/MovePage.php @@ -141,8 +141,9 @@ class MovePage { } $tp = $this->newTitle->getTitleProtection(); - if ( $tp !== false && !$user->isAllowed( $tp['permission'] ) ) { - $status->fatal( 'cantmove-titleprotected' ); + $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + if ( $tp !== false && !$permissionManager->userHasRight( $user, $tp['permission'] ) ) { + $status->fatal( 'cantmove-titleprotected' ); } Hooks::run( 'MovePageCheckPermissions', @@ -351,7 +352,8 @@ class MovePage { } // Check suppressredirect permission - if ( !$user->isAllowed( 'suppressredirect' ) ) { + $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + if ( !$permissionManager->userHasRight( $user, 'suppressredirect' ) ) { $createRedirect = true; } @@ -444,7 +446,7 @@ class MovePage { $status = Status::newFatal( 'movepage-max-pages', $wgMaximumMovedPages ); $perTitleStatus[$oldSubpage->getPrefixedText()] = $status; $topStatus->merge( $status ); - $topStatus->setOk( true ); + $topStatus->setOK( true ); break; } @@ -477,7 +479,7 @@ class MovePage { } $perTitleStatus[$oldSubpage->getPrefixedText()] = $status; $topStatus->merge( $status ); - $topStatus->setOk( true ); + $topStatus->setOK( true ); } $topStatus->value = $perTitleStatus; @@ -596,7 +598,7 @@ class MovePage { '4::oldtitle' => $this->oldTitle->getPrefixedText(), ] ); $logEntry->setRelations( [ 'pr_id' => $logRelationsValues ] ); - $logEntry->setTags( $changeTags ); + $logEntry->addTags( $changeTags ); $logId = $logEntry->insert(); $logEntry->publish( $logId ); } @@ -893,7 +895,7 @@ class MovePage { # Log the move $logid = $logEntry->insert(); - $logEntry->setTags( $changeTags ); + $logEntry->addTags( $changeTags ); $logEntry->publish( $logid ); return $nullRevision;