MediaWiki 1.5.8-scripts

[autoinstallsdev/mediawiki.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 22aaf90938e663b84279555e754f9a0ea9048c4d..3a0a1f1f347727e5effc6cf0cba7fa72416ec6cd 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -118,11 +118,11 @@ wfProfileOut( $fname.'-memcached' );
 wfProfileIn( $fname.'-SetupSession' );
 
 if ( $wgDBprefix ) {
-       $wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
+       $wgCookiePrefix = str_replace("+", "", $wgDBname . '_' . $wgDBprefix);
 } elseif ( $wgSharedDB ) {
        $wgCookiePrefix = $wgSharedDB;
 } else {
-       $wgCookiePrefix = $wgDBname;
+       $wgCookiePrefix = str_replace("+", "", $wgDBname);
 }
 
 session_name( $wgCookiePrefix . '_session' );