MediaWiki r37893 - Code Review

Index: trunk/phase3/includes/Setup.php
===================================================================
--- trunk/phase3/includes/Setup.php	(revision 37892)
+++ trunk/phase3/includes/Setup.php	(revision 37893)
@@ -204,14 +204,16 @@
 # Set default shared prefix
 if( $wgSharedPrefix === false ) $wgSharedPrefix = $wgDBprefix;
 
-if ( in_array('user', $wgSharedTables) && $wgSharedDB && $wgSharedPrefix ) {
-	$wgCookiePrefix = $wgSharedDB . '_' . $wgSharedPrefix;
-} elseif ( in_array('user', $wgSharedTables) && $wgSharedDB ) {
-	$wgCookiePrefix = $wgSharedDB;
-} elseif ( $wgDBprefix ) {
-	$wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
-} else {
-	$wgCookiePrefix = $wgDBname;
+if( !$wgCookiePrefix ) {
+	if ( in_array('user', $wgSharedTables) && $wgSharedDB && $wgSharedPrefix ) {
+		$wgCookiePrefix = $wgSharedDB . '_' . $wgSharedPrefix;
+	} elseif ( in_array('user', $wgSharedTables) && $wgSharedDB ) {
+		$wgCookiePrefix = $wgSharedDB;
+	} elseif ( $wgDBprefix ) {
+		$wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
+	} else {
+		$wgCookiePrefix = $wgDBname;
+	}
 }
 $wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");
 
Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php	(revision 37892)
+++ trunk/phase3/includes/DefaultSettings.php	(revision 37893)
@@ -1528,6 +1528,12 @@
 $wgDisableCookieCheck = false;
 
 /**
+ * Set $wgCookiePrefix to use a custom one. Setting to false sets the default of
+ * using the database name.
+ */
+$wgCookiePrefix = false;
+
+/**
  * Set authentication cookies to HttpOnly to prevent access by JavaScript,
  * in browsers that support this feature. This can mitigates some classes of
  * XSS attack.
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES	(revision 37892)
+++ trunk/phase3/RELEASE-NOTES	(revision 37893)
@@ -68,6 +68,8 @@
   with MimeMagic.
 * Added $wgDirectoryMode, which allows for setting the default CHMOD value when
   creating new directories.
+* (bug 14843) $wgCookiePrefix can be set by LocalSettings now, false defaults 
+  current behavior.
 
 === New features in 1.13 ===