Committing another live hack for which I'm tired of getting conflicts.

Basically I'm overriding wfWikiID to run multiple instances on same database
but with different settings, and I don't want to them mess each others caches.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b9a6776..207a63d 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4158,6 +4158,14 @@ $wgParserTestFiles = array(
  */
 $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.
+ * @since 1.19
+ */
+$wgWikiID = false;
+
 /** @} */ # end of profiling, testing and debugging }
 
 /************************************************************************//**

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4a722b5..bdf0840 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3148,8 +3148,10 @@ function wfForeignMemcKey( $db, $prefix /*, ... */ ) {
  * @return String
  */
 function wfWikiID() {
-       global $wgDBprefix, $wgDBname;
-       if ( $wgDBprefix ) {
+       global $wgDBprefix, $wgDBname, $wgWikiID;
+       if ( $wgWikiID !== false ) {
+               return $wgWikiID;
+       } elseif ( $wgDBprefix ) {
                return "$wgDBname-$wgDBprefix";
        } else {
                return $wgDBname;