Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/385096 )
Change subject: Mention colons in BagOStuff key generation
......................................................................
Mention colons in BagOStuff key generation
Change-Id: I76967245c32aac4eea8d6672e4fc1fac5e5f3d07
---
M includes/libs/objectcache/BagOStuff.php
M includes/libs/objectcache/WANObjectCache.php
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/96/385096/1
diff --git a/includes/libs/objectcache/BagOStuff.php
b/includes/libs/objectcache/BagOStuff.php
index 8a23db5..0a87d2b 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -732,7 +732,7 @@
* @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;
@@ -748,7 +748,7 @@
*
* @since 1.27
* @param string $keys,... Key component
- * @return string
+ * @return string Colon-delimited list of $keyspace followed by escaped
components of $args
*/
public function makeGlobalKey() {
return $this->makeKeyInternal( 'global', func_get_args() );
@@ -759,7 +759,7 @@
*
* @since 1.27
* @param string $keys,... Key component
- * @return string
+ * @return string Colon-delimited list of $keyspace followed by escaped
components of $args
*/
public function makeKey() {
return $this->makeKeyInternal( $this->keyspace, func_get_args()
);
diff --git a/includes/libs/objectcache/WANObjectCache.php
b/includes/libs/objectcache/WANObjectCache.php
index cab5782..d2f88f9 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -1316,7 +1316,7 @@
/**
* @see BagOStuff::makeKey()
* @param string $keys,... Key component
- * @return string
+ * @return string Colon-delimited list of $keyspace followed by escaped
components of $args
* @since 1.27
*/
public function makeKey() {
@@ -1326,7 +1326,7 @@
/**
* @see BagOStuff::makeGlobalKey()
* @param string $keys,... Key component
- * @return string
+ * @return string Colon-delimited list of $keyspace followed by escaped
components of $args
* @since 1.27
*/
public function makeGlobalKey() {
--
To view, visit https://gerrit.wikimedia.org/r/385096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76967245c32aac4eea8d6672e4fc1fac5e5f3d07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
