X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fskins%2FSkin.php;h=b0d067820a0c9f8eaf2bcb39974bb37490eb8036;hb=43fe3f21d48075ebbabcf0825b1520804ca9175e;hp=eeed05e95f5b85056834293b403a662476d9d7a1;hpb=cc41773f61c23b922fe4cfc513b105ec4d32eeec;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index eeed05e95f..b0d067820a 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -61,9 +61,11 @@ abstract class Skin extends ContextSource {
 
 	/**
 	 * Fetch the skinname messages for available skins.
+	 * @deprecated since 1.34, no longer used.
 	 * @return string[]
 	 */
 	static function getSkinNameMessages() {
+		wfDeprecated( __METHOD__, '1.34' );
 		$messages = [];
 		foreach ( self::getSkinNames() as $skinKey => $skinName ) {
 			$messages[] = "skinname-$skinKey";
@@ -459,7 +461,9 @@ abstract class Skin extends ContextSource {
 				$type = 'ns-subject';
 			}
 			// T208315: add HTML class when the user can edit the page
-			if ( $title->quickUserCan( 'edit', $user ) ) {
+			if ( MediaWikiServices::getInstance()->getPermissionManager()
+					->quickUserCan( 'edit', $user, $title )
+			) {
 				$type .= ' mw-editable';
 			}
 		}
@@ -723,14 +727,17 @@ abstract class Skin extends ContextSource {
 		$action = $this->getRequest()->getVal( 'action', 'view' );
 		$title = $this->getTitle();
 		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+		$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 
 		if ( ( !$title->exists() || $action == 'history' ) &&
-			$title->quickUserCan( 'deletedhistory', $this->getUser() )
+			$permissionManager->quickUserCan( 'deletedhistory', $this->getUser(), $title )
 		) {
 			$n = $title->isDeleted();
 
 			if ( $n ) {
-				if ( $this->getTitle()->quickUserCan( 'undelete', $this->getUser() ) ) {
+				if ( $permissionManager->quickUserCan( 'undelete',
+						$this->getUser(), $this->getTitle() )
+				) {
 					$msg = 'thisisdeleted';
 				} else {
 					$msg = 'viewdeleted';
@@ -1311,19 +1318,21 @@ abstract class Skin extends ContextSource {
 	 * @return array
 	 */
 	public function buildSidebar() {
+		$services = MediaWikiServices::getInstance();
 		$callback = function ( $old = null, &$ttl = null ) {
 			$bar = [];
 			$this->addToSidebar( $bar, 'sidebar' );
 			Hooks::run( 'SkinBuildSidebar', [ $this, &$bar ] );
-			if ( MessageCache::singleton()->isDisabled() ) {
+			$msgCache = MediaWikiServices::getInstance()->getMessageCache();
+			if ( $msgCache->isDisabled() ) {
 				$ttl = WANObjectCache::TTL_UNCACHEABLE; // bug T133069
 			}
 
 			return $bar;
 		};
 
-		$msgCache = MessageCache::singleton();
-		$wanCache = MediaWikiServices::getInstance()->getMainWANObjectCache();
+		$msgCache = $services->getMessageCache();
+		$wanCache = $services->getMainWANObjectCache();
 		$config = $this->getConfig();
 
 		$sidebar = $config->get( 'EnableSidebarCache' )