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 "Move up devunt's name to Developers"
[lhc/web/wiklou.git]
/
includes
/
registration
/
ExtensionRegistry.php
diff --git
a/includes/registration/ExtensionRegistry.php
b/includes/registration/ExtensionRegistry.php
index
dc53ca4
..
35044e1
100644
(file)
--- a/
includes/registration/ExtensionRegistry.php
+++ b/
includes/registration/ExtensionRegistry.php
@@
-1,5
+1,7
@@
<?php
<?php
+use MediaWiki\MediaWikiServices;
+
/**
* ExtensionRegistry class
*
/**
* ExtensionRegistry class
*
@@
-19,7
+21,7
@@
class ExtensionRegistry {
/**
* Version of the highest supported manifest version
*/
/**
* Version of the highest supported manifest version
*/
- const MANIFEST_VERSION =
1
;
+ const MANIFEST_VERSION =
2
;
/**
* Version of the oldest supported manifest version
/**
* Version of the oldest supported manifest version
@@
-86,7
+88,7
@@
class ExtensionRegistry {
// we don't want to fail here if $wgObjectCaches is not configured
// properly for APC setup
try {
// we don't want to fail here if $wgObjectCaches is not configured
// properly for APC setup
try {
- $this->cache =
ObjectCache::getLocalServerInstanc
e();
+ $this->cache =
MediaWikiServices::getInstance()->getLocalServerObjectCach
e();
} catch ( MWException $e ) {
$this->cache = new EmptyBagOStuff();
}
} catch ( MWException $e ) {
$this->cache = new EmptyBagOStuff();
}