Merge "RevisionStoreDbTestBase, remove redundant needsDB override"

[lhc/web/wiklou.git] / includes / Preferences.php

diff --git a/includes/Preferences.php b/includes/Preferences.php
index a8a312c..6d379dc 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -35,12 +35,13 @@ class Preferences {
         * @return DefaultPreferencesFactory
         */
        protected static function getDefaultPreferencesFactory() {
-               global $wgContLang;
+               $services = MediaWikiServices::getInstance();
                $authManager = AuthManager::singleton();
-               $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
-               $config = MediaWikiServices::getInstance()->getMainConfig();
+               $linkRenderer = $services->getLinkRenderer();
+               $config = $services->getMainConfig();
                $preferencesFactory = new DefaultPreferencesFactory(
-                       $config, $wgContLang, $authManager, $linkRenderer
+                       $config, $services->getContentLanguage(), $authManager,
+                       $linkRenderer
                );
                return $preferencesFactory;
        }