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 "Clean up some database domain ID related code and fix some comments"
[lhc/web/wiklou.git]
/
includes
/
MediaWikiServices.php
diff --git
a/includes/MediaWikiServices.php
b/includes/MediaWikiServices.php
index
0e36b22
..
292e8df
100644
(file)
--- a/
includes/MediaWikiServices.php
+++ b/
includes/MediaWikiServices.php
@@
-36,9
+36,6
@@
use MediaHandlerFactory;
use MediaWiki\Config\ConfigRepository;
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\Linker\LinkRendererFactory;
use MediaWiki\Config\ConfigRepository;
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\Linker\LinkRendererFactory;
-use MediaWiki\Services\SalvageableService;
-use MediaWiki\Services\ServiceContainer;
-use MediaWiki\Services\NoSuchServiceException;
use MWException;
use MimeAnalyzer;
use ObjectCache;
use MWException;
use MimeAnalyzer;
use ObjectCache;
@@
-47,6
+44,7
@@
use ParserCache;
use ParserFactory;
use PasswordFactory;
use ProxyLookup;
use ParserFactory;
use PasswordFactory;
use ProxyLookup;
+use ResourceLoader;
use SearchEngine;
use SearchEngineConfig;
use SearchEngineFactory;
use SearchEngine;
use SearchEngineConfig;
use SearchEngineFactory;
@@
-58,6
+56,9
@@
use SkinFactory;
use TitleFormatter;
use TitleParser;
use VirtualRESTServiceClient;
use TitleFormatter;
use TitleParser;
use VirtualRESTServiceClient;
+use Wikimedia\Services\SalvageableService;
+use Wikimedia\Services\ServiceContainer;
+use Wikimedia\Services\NoSuchServiceException;
use MediaWiki\Interwiki\InterwikiLookup;
use MagicWordFactory;
use MediaWiki\Interwiki\InterwikiLookup;
use MagicWordFactory;
@@
-744,6
+745,14
@@
class MediaWikiServices extends ServiceContainer {
return $this->getService( 'ReadOnlyMode' );
}
return $this->getService( 'ReadOnlyMode' );
}
+ /**
+ * @since 1.33
+ * @return ResourceLoader
+ */
+ public function getResourceLoader() {
+ return $this->getService( 'ResourceLoader' );
+ }
+
/**
* @since 1.31
* @return RevisionFactory
/**
* @since 1.31
* @return RevisionFactory