Merge "Fix up deprecation of wfMemcKey()/wfGlobalCacheKey()"

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 97356fd..9ff7e97 100644 (file)
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -77,8 +77,8 @@ changes to languages because of Phabricator reports.
 * The ExtractThumbParameters hook (deprecated in 1.21) was removed.
 * The OutputPage::addParserOutputNoText and ::getHeadLinks methods (both
   deprecated in 1.24) were removed.
-* wfMemcKey() and wfGlobalCacheKey() were deprecated. ObjectCache::makeKey() and
-  ObjectCache::makeGlobalKey() should be used instead.
+* wfMemcKey() and wfGlobalCacheKey() were deprecated. BagOStuff::makeKey() and
+  BagOStuff::makeGlobalKey() should be used instead.
 * (T146304) Preprocessor handling of LanguageConverter markup has been improved.
   As a result of the new uniform handling, '-{' may need to be escaped
   (for example, as '-<nowiki/>{') where it occurs inside template arguments

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 9c70639..1859c02 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2960,10 +2960,9 @@ function wfGetPrecompiledData( $name ) {
 }
 
 /**
- * @deprecated since 1.30 Call makeKey on a ObjectCache instance
- *
  * Make a cache key for the local wiki.
  *
+ * @deprecated since 1.30 Call makeKey on a BagOStuff instance
  * @param string $args,...
  * @return string
  */
@@ -2994,14 +2993,13 @@ function wfForeignMemcKey( $db, $prefix /*...*/ ) {
 }
 
 /**
- * @deprecated since 1.30 Call makeGlobalKey on a ObjectCache instance
- *
  * Make a cache key with database-agnostic prefix.
  *
  * Doesn't have a wiki-specific namespace. Uses a generic 'global' prefix
  * instead. Must have a prefix as otherwise keys that use a database name
  * in the first segment will clash with wfMemcKey/wfForeignMemcKey.
  *
+ * @deprecated since 1.30 Call makeGlobalKey on a BagOStuff instance
  * @since 1.26
  * @param string $args,...
  * @return string