dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "OutputPageTest: Don't rely on side effects of previous tests"
[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() {
* @return DefaultPreferencesFactory
*/
protected static function getDefaultPreferencesFactory() {
-
global $wgContLang
;
+
$services = MediaWikiServices::getInstance()
;
$authManager = AuthManager::singleton();
$authManager = AuthManager::singleton();
- $linkRenderer =
MediaWikiServices::getInstance()
->getLinkRenderer();
- $config =
MediaWikiServices::getInstance()
->getMainConfig();
+ $linkRenderer =
$services
->getLinkRenderer();
+ $config =
$services
->getMainConfig();
$preferencesFactory = new DefaultPreferencesFactory(
$preferencesFactory = new DefaultPreferencesFactory(
- $config, $wgContLang, $authManager, $linkRenderer
+ $config, $services->getContentLanguage(), $authManager,
+ $linkRenderer
);
return $preferencesFactory;
}
);
return $preferencesFactory;
}