From cefab8bcbef084306fe0f9ba1c50a9ec6e1b7f37 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 25 May 2017 00:47:27 -0700 Subject: [PATCH] page: Avoid deprecated wfMemcKey() And the deprecated ObjectCache::getMainWANInstance(), getMainStashInstance() while we're at it. Change-Id: I951c356f1c394a9658216dea54c92824dca83cbc --- includes/page/Article.php | 12 ++++++------ includes/page/WikiPage.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/page/Article.php b/includes/page/Article.php index 3c767f5658..dd542323cb 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -980,8 +980,8 @@ class Article implements Page { } // Check for cached results - $key = wfMemcKey( 'unpatrollable-page', $title->getArticleID() ); - $cache = ObjectCache::getMainWANInstance(); + $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); + $key = $cache->makeKey( 'unpatrollable-page', $title->getArticleID() ); if ( $cache->get( $key ) ) { return false; } @@ -1121,8 +1121,8 @@ class Article implements Page { * @since 1.27 */ public static function purgePatrolFooterCache( $articleID ) { - $cache = ObjectCache::getMainWANInstance(); - $cache->delete( wfMemcKey( 'unpatrollable-page', $articleID ) ); + $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); + $cache->delete( $cache->makeKey( 'unpatrollable-page', $articleID ) ); } /** @@ -1177,8 +1177,8 @@ class Article implements Page { # Show delete and move logs if there were any such events. # The logging query can DOS the site when bots/crawlers cause 404 floods, # so be careful showing this. 404 pages must be cheap as they are hard to cache. - $cache = ObjectCache::getMainStashInstance(); - $key = wfMemcKey( 'page-recent-delete', md5( $title->getPrefixedText() ) ); + $cache = MediaWikiServices::getInstance()->getMainObjectStash(); + $key = $cache->makeKey( 'page-recent-delete', md5( $title->getPrefixedText() ) ); $loggedIn = $this->getContext()->getUser()->isLoggedIn(); if ( $loggedIn || $cache->get( $key ) ) { $logTypes = [ 'delete', 'move' ]; diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index a687900431..e5356171a6 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2901,8 +2901,8 @@ class WikiPage implements Page, IDBAccessObject { $status->value = $logid; // Show log excerpt on 404 pages rather than just a link - $cache = ObjectCache::getMainStashInstance(); - $key = wfMemcKey( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) ); + $cache = MediaWikiServices::getInstance()->getMainObjectStash(); + $key = $cache->makeKey( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) ); $cache->set( $key, 1, $cache::TTL_DAY ); return $status; -- 2.20.1