From 314cda9b0abc3f0f7f25c112ca311983292ac79f Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 23 May 2017 14:57:35 -0700 Subject: [PATCH] Fix up deprecation of wfMemcKey()/wfGlobalCacheKey() * Move @deprecated tags out of the header so the documentation comment still has a summary * makeKey() and co. are part of BagOStuff, not ObjectCache Follows up 1e5961dbf6a. Change-Id: I168ce97597f288f6345a404354d68371e57522d3 --- RELEASE-NOTES-1.30 | 4 ++-- includes/GlobalFunctions.php | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30 index 97356fd409..9ff7e97166 100644 --- 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 '-{') where it occurs inside template arguments diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 9c70639bc8..1859c02e43 100644 --- 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 -- 2.20.1