X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fpage%2FArticle.php;h=4bede965ab7f1c6c76bef98db380b76529400a11;hb=7d54426c3794aa601f250cd314060a39725bd8b0;hp=014917131237e604e9a96c8a7856c52890983a1b;hpb=25be8cc5859e2f9f6560d6d1d52a47888023fbd6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 0149171312..4bede965ab 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -587,7 +587,7 @@ class Article implements Page {
 	 * page of the given title.
 	 */
 	public function view() {
-		global $wgUseFileCache, $wgDebugToolbar;
+		global $wgUseFileCache;
 
 		# Get variables from query string
 		# As side effect this will load the revision and update the title
@@ -643,7 +643,7 @@ class Article implements Page {
 		}
 
 		# Try client and file cache
-		if ( !$wgDebugToolbar && $oldid === 0 && $this->mPage->checkTouched() ) {
+		if ( $oldid === 0 && $this->mPage->checkTouched() ) {
 			# Try to stream the output from file cache
 			if ( $wgUseFileCache && $this->tryFileCache() ) {
 				wfDebug( __METHOD__ . ": done file cache\n" );
@@ -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 );
 
@@ -1986,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',
@@ -2045,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(),