Using a different session name for each database, so they don't interfere with each...

diff --git a/includes/Setup.php b/includes/Setup.php
index 96e277b..0db7307 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -115,7 +115,13 @@ wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
 wfProfileOut( $fname.'-memcached' );
 wfProfileIn( $fname.'-SetupSession' );
 
-if( !$wgCommandLineMode && ( isset( $_COOKIE[ini_get('session.name')] ) || isset( $_COOKIE[$wgDBname.'Token'] ) ) ) {
+if ( $wgDBprefix ) {
+       session_name( $wgDBname . '_' . $wgDBprefix . '_session' );
+} else {
+       session_name( $wgDBname . '_session' );
+}
+
+if( !$wgCommandLineMode && ( isset( $_COOKIE[session_name()] ) || isset( $_COOKIE[$wgDBname.'Token'] ) ) ) {
        User::SetupSession();
        $wgSessionStarted = true;
 } else {