dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add option to expose original sha1 in thumb url"
[lhc/web/wiklou.git]
/
includes
/
objectcache
/
MemcachedBagOStuff.php
diff --git
a/includes/objectcache/MemcachedBagOStuff.php
b/includes/objectcache/MemcachedBagOStuff.php
index
eeca9b1
..
7d12749
100644
(file)
--- a/
includes/objectcache/MemcachedBagOStuff.php
+++ b/
includes/objectcache/MemcachedBagOStuff.php
@@
-57,12
+57,7
@@
class MemcachedBagOStuff extends BagOStuff {
return $params;
}
return $params;
}
- /**
- * @param string $key
- * @param mixed $casToken [optional]
- * @return mixed
- */
- public function get( $key, &$casToken = null ) {
+ public function get( $key, &$casToken = null, $flags = 0 ) {
return $this->client->get( $this->encodeKey( $key ), $casToken );
}
return $this->client->get( $this->encodeKey( $key ), $casToken );
}
@@
-173,7
+168,10
@@
class MemcachedBagOStuff extends BagOStuff {
* @return string
*/
public function decodeKey( $key ) {
* @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 );
}
/**
}
/**