Merge "Deprecate wfMemcKey() and wfGlobalCacheKey()"

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 4e25532..42ae368 100644 (file)
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -76,6 +76,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.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d21cc1d..10a67c3 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2960,6 +2960,8 @@ function wfGetPrecompiledData( $name ) {
 }
 
 /**
+ * @deprecated since 1.30 Call makeKey on a ObjectCache instance
+ *
  * Make a cache key for the local wiki.
  *
  * @param string $args,...
@@ -2992,6 +2994,8 @@ 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