source: locker/deploy/mediawiki-1.11.0/mediawiki-1.11.0.patch @ 463

AdminSettings.php

@@ +1 @@
+<?php
+/**
+ * On scripts.mit.edu, the user's sole account can be used
+ * both for regular operation of the wiki and for any
+ * maintenance.  Therefore, we just use the username and
+ * password already set in LocalSettings.php.
+ *
+ * @package MediaWiki
+ */
+          
+$wgDBadminuser      = $wgDBuser;
+$wgDBadminpassword  = $wgDBpassword;
+          
+/*
+ * Whether to enable the profileinfo.php script.
+ * (False is the default.)
+ */
+$wgEnableProfileInfo = false;
+          
+?>

includes/Setup.php

@@ -188 +188 @@
 wfProfileIn( $fname.'-SetupSession' );
 
 if ( $wgDBprefix ) {
-        $wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
+        $wgCookiePrefix = str_replace("+", "", $wgDBname . '_' . $wgDBprefix);
 } elseif ( $wgSharedDB ) {
         $wgCookiePrefix = $wgSharedDB;
 } else {
-        $wgCookiePrefix = $wgDBname;
+        $wgCookiePrefix = str_replace("+", "", $wgDBname);
 }
 $wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");