From: Derick Alangi <alangiderick@gmail.com>
Date: Tue, 27 Aug 2019 22:01:04 +0000 (+0100)
Subject: skins: Remove use of deprecated MessageCache::singleton()
X-Git-Tag: 1.34.0-rc.0~528^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=87868a77c2282697e71d1f86704b4dfb74a383d1;p=lhc%2Fweb%2Fwiklou.git

skins: Remove use of deprecated MessageCache::singleton()

Change-Id: I1c6d3874dd78023d743a418039c23adb55578f98
---

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index eeed05e95f..6ec7cb20a3 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1311,19 +1311,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' )