From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Wed, 7 May 2008 06:05:26 +0000 (+0000)
Subject: Now that I think about it, we're going to have to set $wgSharedPrefix inside of Setup... 
X-Git-Tag: 1.31.0-rc.0~47851
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=12e47b7f7b54c1eeed477aa402d9130bb8c77696;p=lhc%2Fweb%2Fwiklou.git

Now that I think about it, we're going to have to set $wgSharedPrefix inside of Setup.php so that it can inherit from a $wgDBprefix inside of LocalSettings.php.
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 32e9906b56..4ac2eb22ec 100644
--- 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 ecdb819158..92e310bd34 100644
--- 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 ) {