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 "registration: Only allow one extension to set a specific config setting"
[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
..
d6cb340
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,8
+747,8
@@
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 $keys,... Key component
(starting with a key collection name)
+ * @return string
Colon-delimited list of $keyspace followed by escaped components of $args
*/
public function makeGlobalKey() {
return $this->makeKeyInternal( 'global', func_get_args() );
*/
public function makeGlobalKey() {
return $this->makeKeyInternal( 'global', func_get_args() );
@@
-758,8
+758,8
@@
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 $keys,... Key component
(starting with a key collection name)
+ * @return string
Colon-delimited list of $keyspace followed by escaped components of $args
*/
public function makeKey() {
return $this->makeKeyInternal( $this->keyspace, func_get_args() );
*/
public function makeKey() {
return $this->makeKeyInternal( $this->keyspace, func_get_args() );