| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -3210,8 +3210,10 @@ |
| 3211 | 3211 | * @return String |
| 3212 | 3212 | */ |
| 3213 | 3213 | function wfMemcKey( /*... */ ) { |
| | 3214 | + global $wgCachePrefix; |
| | 3215 | + $prefix = $wgCachePrefix === false ? wfWikiID() : $wgCachePrefix; |
| 3214 | 3216 | $args = func_get_args(); |
| 3215 | | - $key = wfWikiID() . ':' . implode( ':', $args ); |
| | 3217 | + $key = $prefix . ':' . implode( ':', $args ); |
| 3216 | 3218 | $key = str_replace( ' ', '_', $key ); |
| 3217 | 3219 | return $key; |
| 3218 | 3220 | } |
| — | — | @@ -3241,10 +3243,8 @@ |
| 3242 | 3244 | * @return String |
| 3243 | 3245 | */ |
| 3244 | 3246 | function wfWikiID() { |
| 3245 | | - global $wgDBprefix, $wgDBname, $wgWikiID; |
| 3246 | | - if ( $wgWikiID !== false ) { |
| 3247 | | - return $wgWikiID; |
| 3248 | | - } elseif ( $wgDBprefix ) { |
| | 3247 | + global $wgDBprefix, $wgDBname; |
| | 3248 | + if ( $wgDBprefix ) { |
| 3249 | 3249 | return "$wgDBname-$wgDBprefix"; |
| 3250 | 3250 | } else { |
| 3251 | 3251 | return $wgDBname; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -4156,11 +4156,10 @@ |
| 4157 | 4157 | |
| 4158 | 4158 | |
| 4159 | 4159 | /** |
| 4160 | | - * Overwrite the caching key prefix with custom value. Do not set if using |
| 4161 | | - * load balancer, since it depends on the key being in certain format. |
| | 4160 | + * Overwrite the caching key prefix with custom value. |
| 4162 | 4161 | * @since 1.19 |
| 4163 | 4162 | */ |
| 4164 | | -$wgWikiID = false; |
| | 4163 | +$wgCachePrefix = false; |
| 4165 | 4164 | |
| 4166 | 4165 | /** |
| 4167 | 4166 | * Display the new debugging toolbar. This also enables profiling on database |