dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f90f685
)
Using a different session name for each database, so they don't interfere with each...
author
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 14 May 2005 09:27:24 +0000
(09:27 +0000)
committer
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 14 May 2005 09:27:24 +0000
(09:27 +0000)
includes/Setup.php
patch
|
blob
|
history
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' );
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 {
User::SetupSession();
$wgSessionStarted = true;
} else {