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
User: Migrate from foreign cache to global cache for UserRightsProxy
[lhc/web/wiklou.git]
/
includes
/
objectcache
/
ObjectCache.php
diff --git
a/includes/objectcache/ObjectCache.php
b/includes/objectcache/ObjectCache.php
index
59c3c1f
..
abb88ba
100644
(file)
--- a/
includes/objectcache/ObjectCache.php
+++ b/
includes/objectcache/ObjectCache.php
@@
-137,19
+137,14
@@
class ObjectCache {
* @return string
*/
public static function getDefaultKeyspace() {
* @return string
*/
public static function getDefaultKeyspace() {
- global $wgCachePrefix
, $wgDBname, $wgDBprefix
;
+ global $wgCachePrefix;
$keyspace = $wgCachePrefix;
if ( is_string( $keyspace ) && $keyspace !== '' ) {
return $keyspace;
}
$keyspace = $wgCachePrefix;
if ( is_string( $keyspace ) && $keyspace !== '' ) {
return $keyspace;
}
- $keyspace = $wgDBname;
- if ( is_string( $wgDBprefix ) && $wgDBprefix !== '' ) {
- $keyspace .= '-' . $wgDBprefix;
- }
-
- return $keyspace;
+ return wfWikiID();
}
/**
}
/**
@@
-269,7
+264,7
@@
class ObjectCache {
}
$id = $fallback;
}
}
$id = $fallback;
}
- return self::
newFromId
( $id );
+ return self::
getInstance
( $id );
}
/**
}
/**