X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fpage%2FArticle.php;h=4bede965ab7f1c6c76bef98db380b76529400a11;hb=7d54426c3794aa601f250cd314060a39725bd8b0;hp=535aeffeb3cb5bf600cb361ab752941600ab0a56;hpb=d18e76dbef35efeb1f735bb070e54be5dc629e4b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/page/Article.php b/includes/page/Article.php index 535aeffeb3..4bede965ab 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -1310,7 +1310,10 @@ class Article implements Page { } $outputPage->preventClickjacking(); - if ( $user->isAllowed( 'writeapi' ) ) { + if ( MediaWikiServices::getInstance() + ->getPermissionManager() + ->userHasRight( $user, 'writeapi' ) + ) { $outputPage->addModules( 'mediawiki.page.patrol.ajax' ); } @@ -1827,7 +1830,10 @@ class Article implements Page { [ 'delete', $this->getTitle()->getPrefixedText() ] ) ) { # Flag to hide all contents of the archived revisions - $suppress = $request->getCheck( 'wpSuppress' ) && $user->isAllowed( 'suppressrevision' ); + + $suppress = $request->getCheck( 'wpSuppress' ) && MediaWikiServices::getInstance() + ->getPermissionManager() + ->userHasRight( $user, 'suppressrevision' ); $this->doDelete( $reason, $suppress ); @@ -1929,6 +1935,8 @@ class Article implements Page { $outputPage->enableOOUI(); + $fields = []; + $options = Xml::listDropDownOptions( $ctx->msg( 'deletereason-dropdown' )->inContentLanguage()->text(), [ 'other' => $ctx->msg( 'deletereasonotherlist' )->inContentLanguage()->text() ] @@ -1984,8 +1992,8 @@ class Article implements Page { ] ); } - - if ( $user->isAllowed( 'suppressrevision' ) ) { + $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + if ( $permissionManager->userHasRight( $user, 'suppressrevision' ) ) { $fields[] = new OOUI\FieldLayout( new OOUI\CheckboxInputWidget( [ 'name' => 'wpSuppress', @@ -2043,7 +2051,7 @@ class Article implements Page { ] ) ); - if ( $user->isAllowed( 'editinterface' ) ) { + if ( $permissionManager->userHasRight( $user, 'editinterface' ) ) { $link = Linker::linkKnown( $ctx->msg( 'deletereason-dropdown' )->inContentLanguage()->getTitle(), wfMessage( 'delete-edit-reasonlist' )->escaped(),