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 "Rewrite pref cleanup script"
[lhc/web/wiklou.git]
/
includes
/
libs
/
objectcache
/
BagOStuff.php
diff --git
a/includes/libs/objectcache/BagOStuff.php
b/includes/libs/objectcache/BagOStuff.php
index
8a23db5
..
8420f11
100644
(file)
--- a/
includes/libs/objectcache/BagOStuff.php
+++ b/
includes/libs/objectcache/BagOStuff.php
@@
-732,7
+732,7
@@
abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
* @since 1.27
* @param string $keyspace
* @param array $args
* @since 1.27
* @param string $keyspace
* @param array $args
- * @return string
+ * @return string
Colon-delimited list of $keyspace followed by escaped components of $args
*/
public function makeKeyInternal( $keyspace, $args ) {
$key = $keyspace;
*/
public function makeKeyInternal( $keyspace, $args ) {
$key = $keyspace;
@@
-747,10
+747,11
@@
abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
* Make a global cache key.
*
* @since 1.27
* Make a global cache key.
*
* @since 1.27
- * @param string $keys,... Key component
- * @return string
+ * @param string $class Key class
+ * @param string $component [optional] Key component (starting with a key collection name)
+ * @return string Colon-delimited list of $keyspace followed by escaped components of $args
*/
*/
- public function makeGlobalKey() {
+ public function makeGlobalKey(
$class, $component = null
) {
return $this->makeKeyInternal( 'global', func_get_args() );
}
return $this->makeKeyInternal( 'global', func_get_args() );
}
@@
-758,10
+759,11
@@
abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
* Make a cache key, scoped to this instance's keyspace.
*
* @since 1.27
* Make a cache key, scoped to this instance's keyspace.
*
* @since 1.27
- * @param string $keys,... Key component
- * @return string
+ * @param string $class Key class
+ * @param string $component [optional] Key component (starting with a key collection name)
+ * @return string Colon-delimited list of $keyspace followed by escaped components of $args
*/
*/
- public function makeKey() {
+ public function makeKey(
$class, $component = null
) {
return $this->makeKeyInternal( $this->keyspace, func_get_args() );
}
return $this->makeKeyInternal( $this->keyspace, func_get_args() );
}