From 2b79fc74e52a7dfa8676073337ca2ab2bbb338d3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Thu, 8 Dec 2011 09:07:10 +0000 Subject: [PATCH] Revert r97468 and implemented it in another way suggested by Tim --- includes/DefaultSettings.php | 5 ++--- includes/GlobalFunctions.php | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 1eefa55d65..932cf83c96 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -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 diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 02c6c943b9..7624887516 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -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; -- 2.20.1