skins: Remove use of deprecated MessageCache::singleton()
authorDerick Alangi <alangiderick@gmail.com>
Tue, 27 Aug 2019 22:01:04 +0000 (23:01 +0100)
committerDerick Alangi <alangiderick@gmail.com>
Tue, 27 Aug 2019 22:31:18 +0000 (23:31 +0100)
Change-Id: I1c6d3874dd78023d743a418039c23adb55578f98

includes/skins/Skin.php

index eeed05e..6ec7cb2 100644 (file)
@@ -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' )