X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fobjectcache%2FMemcachedBagOStuff.php;h=7d1274921c1c757f81f95e9336e1d28a3f310b4b;hb=415b31766677e190c13322742b4e42da1157538c;hp=e545aa55a6ac0e923be3a721961db133db6eddb6;hpb=0ea03a7f56070956838ab360a5dccc2a506fc4ff;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/objectcache/MemcachedBagOStuff.php b/includes/objectcache/MemcachedBagOStuff.php
index e545aa55a6..7d1274921c 100644
--- a/includes/objectcache/MemcachedBagOStuff.php
+++ b/includes/objectcache/MemcachedBagOStuff.php
@@ -168,7 +168,10 @@ class MemcachedBagOStuff extends BagOStuff {
 	 * @return string
 	 */
 	public function decodeKey( $key ) {
-		return urldecode( $key );
+		// matches %00-%20, %25, %7F (=decoded alternatives for those encoded in encodeKey)
+		return preg_replace_callback( '/%([0-1][0-9]|20|25|7F)/i', function ( $match ) {
+			return urldecode( $match[0] );
+		}, $key );
 	}
 
 	/**