Now that I think about it, we're going to have to set $wgSharedPrefix inside of Setup...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 32e9906..4ac2eb2 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -591,7 +591,7 @@ $wgCheckDBSchema = true;
  * EXPERIMENTAL
  */
 $wgSharedDB     = null;
-$wgSharedPrefix = $wgDBprefix;
+$wgSharedPrefix = false; # Defaults to $wgDBprefix
 $wgSharedTables = array( 'user' );
 
 /**

diff --git a/includes/Setup.php b/includes/Setup.php
index ecdb819..92e310b 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -187,6 +187,9 @@ wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
 wfProfileOut( $fname.'-memcached' );
 wfProfileIn( $fname.'-SetupSession' );
 
+# Set default shared prefix
+if( $wgSharedPrefix === false ) $wgSharedPrefix = $wgDBprefix;
+
 if ( $wgDBprefix ) {
        $wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
 } elseif ( $wgSharedDB ) {