Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ApiHelp: Avoid deprecated ObjectCache::getMainWANInstance()

Browse source 
And switch wfMemcKey() to $cache->makeKey() while we're at it.

Change-Id: I4e37fbe1ddd49cc7583dd0f2f950eaf21c9ef050
This commit is contained in:
Kunal Mehta 2017-05-22 21:37:33 -07:00
parent cfb04229b2
commit 42c91fe7fa
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/api/ApiHelp.php
View file

@ -25,6 +25,7 @@
*/
use HtmlFormatter\HtmlFormatter;
use MediaWiki\MediaWikiServices;
/**
* Class to output help for an API module
@ -108,7 +109,7 @@ class ApiHelp extends ApiBase {
}
$out->setPageTitle( $context->msg( 'api-help-title' ) );
$cache = ObjectCache::getMainWANInstance();
$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
$cacheKey = null;
if ( count( $modules ) == 1 && $modules[0] instanceof ApiMain &&
$options['recursivesubmodules'] && $context->getLanguage() === $wgContLang
@ -116,7 +117,7 @@ class ApiHelp extends ApiBase {
$cacheHelpTimeout = $context->getConfig()->get( 'APICacheHelpTimeout' );
if ( $cacheHelpTimeout > 0 ) {
// Get help text from cache if present
$cacheKey = wfMemcKey( 'apihelp', $modules[0]->getModulePath(),
$cacheKey = $cache->makeKey( 'apihelp', $modules[0]->getModulePath(),
(int)!empty( $options['toc'] ),
str_replace( ' ', '_', SpecialVersion::getVersion( 'nodb' ) ) );
$cached = $cache->get( $cacheKey );