Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert r97468 and implemented it in another way suggested by Tim

Browse source
This commit is contained in:
Niklas Laxström 2011-12-08 09:07:10 +00:00
parent 9f9242ce6f
commit 2b79fc74e5
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/DefaultSettings.php
View file

@ -4156,11 +4156,10 @@ $wgParserTestRemote = false;
/**
* Overwrite the caching key prefix with custom value. Do not set if using
* load balancer, since it depends on the key being in certain format.
* Overwrite the caching key prefix with custom value.
* @since 1.19
*/
$wgWikiID = false;
$wgCachePrefix = false;
/**
* Display the new debugging toolbar. This also enables profiling on database

10
includes/GlobalFunctions.php
View file

@ -3210,8 +3210,10 @@ function wfGetPrecompiledData( $name ) {
* @return String
*/
function wfMemcKey( /*... */ ) {
global $wgCachePrefix;
$prefix = $wgCachePrefix === false ? wfWikiID() : $wgCachePrefix;
$args = func_get_args();
$key = wfWikiID() . ':' . implode( ':', $args );
$key = $prefix . ':' . implode( ':', $args );
$key = str_replace( ' ', '_', $key );
return $key;
}
@ -3241,10 +3243,8 @@ function wfForeignMemcKey( $db, $prefix /*, ... */ ) {
* @return String
*/
function wfWikiID() {
global $wgDBprefix, $wgDBname, $wgWikiID;
if ( $wgWikiID !== false ) {
return $wgWikiID;
} elseif ( $wgDBprefix ) {
global $wgDBprefix, $wgDBname;
if ( $wgDBprefix ) {
return "$wgDBname-$wgDBprefix";
} else {
return $wgDBname;