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 "RevisionStoreDbTestBase, remove redundant needsDB override"
[lhc/web/wiklou.git]
/
includes
/
Setup.php
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
9923ae2
..
43bc2d8
100644
(file)
--- a/
includes/Setup.php
+++ b/
includes/Setup.php
@@
-86,11
+86,6
@@
MediaWiki\HeaderCallback::register();
* Load LocalSettings.php
*/
* Load LocalSettings.php
*/
-if ( is_readable( "$IP/StartProfiler.php" ) ) {
- // @deprecated since 1.32: Use LocalSettings.php instead.
- require "$IP/StartProfiler.php";
-}
-
if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
call_user_func( MW_CONFIG_CALLBACK );
} else {
if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
call_user_func( MW_CONFIG_CALLBACK );
} else {
@@
-774,7
+769,7
@@
if ( $wgCommandLineMode ) {
wfDebug( $debug );
}
wfDebug( $debug );
}
-$wgMemc =
wfGetMainCach
e();
+$wgMemc =
ObjectCache::getLocalClusterInstanc
e();
$messageMemc = wfGetMessageCacheStorage();
wfDebugLog( 'caches',
$messageMemc = wfGetMessageCacheStorage();
wfDebugLog( 'caches',
@@
-898,6
+893,7
@@
$wgOut = RequestContext::getMain()->getOutput(); // BackCompat
/**
* @var Parser $wgParser
/**
* @var Parser $wgParser
+ * @deprecated since 1.32, use MediaWikiServices::getParser() instead
*/
$wgParser = new StubObject( 'wgParser', function () {
return MediaWikiServices::getInstance()->getParser();
*/
$wgParser = new StubObject( 'wgParser', function () {
return MediaWikiServices::getInstance()->getParser();