From: Erik Bernhardson <ebernhardson@wikimedia.org>
Date: Tue, 2 Jul 2013 23:38:04 +0000 (-0700)
Subject: Make wfForeignMemcKey consistent with wfMemcKey
X-Git-Tag: 1.31.0-rc.0~19047^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=213fe05330394db8db9e4363c0bf39f103b51faa;p=lhc%2Fweb%2Fwiklou.git

Make wfForeignMemcKey consistent with wfMemcKey

The wfMemcKey function converts any spaces in the key into _, while
the wfForeignMemcKey does not.  As such they would not return the same
key in certain corner cases.

Change-Id: I520dacdce953414dee5907324c2c98db858bcd42
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a44e45b553..30b36e3df2 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3384,7 +3384,7 @@ function wfForeignMemcKey( $db, $prefix /*, ... */ ) {
 	} else {
 		$key = $db . ':' . implode( ':', $args );
 	}
-	return $key;
+	return str_replace( ' ', '_', $key );
 }
 
 /**