jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375424 )
Change subject: Hygiene: Use BagOfStuff::makeKey() instead of deprecated
wfMemcKey()
......................................................................
Hygiene: Use BagOfStuff::makeKey() instead of deprecated wfMemcKey()
Change-Id: I13c619ab4aedc9f9d4208ba62098cb27b41c283e
---
M includes/api/ApiMobileView.php
M includes/diff/InlineDifferenceEngine.php
2 files changed, 23 insertions(+), 7 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index 8234f93..a19df63 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -530,11 +530,11 @@
* @return array
*/
private function getData( Title $title, $noImages, $oldid = null ) {
+ global $wgMemc;
+
$mfConfig = MobileContext::singleton()->getMFConfig();
$mfMinCachedPageSize = $mfConfig->get( 'MFMinCachedPageSize' );
$mfSpecialCaseMainPage = $mfConfig->get(
'MFSpecialCaseMainPage' );
-
- global $wgMemc;
$result = $this->getResult();
$wp = $this->makeWikiPage( $title );
@@ -563,8 +563,16 @@
$touched = $wp->getTouched();
$revId = $oldid ? $oldid : $title->getLatestRevID();
if ( $this->file ) {
- $key = wfMemcKey( 'mf', 'mobileview',
self::CACHE_VERSION, $noImages,
- $touched, $this->noTransform,
$this->file->getSha1(), $this->variant );
+ $key = $wgMemc->makeKey(
+ 'mf',
+ 'mobileview',
+ self::CACHE_VERSION,
+ $noImages,
+ $touched,
+ $this->noTransform,
+ $this->file->getSha1(),
+ $this->variant
+ );
$cacheExpiry = 3600;
} else {
if ( !$latest ) {
@@ -575,7 +583,7 @@
$parserOptions = $this->makeParserOptions( $wp );
$parserCacheKey =
\MediaWiki\MediaWikiServices::getInstance()->getParserCache()->getKey( $wp,
$parserOptions );
- $key = wfMemcKey(
+ $key = $wgMemc->makeKey(
'mf',
'mobileview',
self::CACHE_VERSION,
diff --git a/includes/diff/InlineDifferenceEngine.php
b/includes/diff/InlineDifferenceEngine.php
index 2354819..a32ddc5 100644
--- a/includes/diff/InlineDifferenceEngine.php
+++ b/includes/diff/InlineDifferenceEngine.php
@@ -206,12 +206,20 @@
* @return string
*/
protected function getDiffBodyCacheKey() {
+ global $wgMemc;
if ( !$this->mOldid || !$this->mNewid ) {
throw new Exception( 'mOldid and mNewid must be set to
get diff cache key.' );
}
- return wfMemcKey( 'diff', 'inline', self::DIFF_VERSION,
- 'oldid', $this->mOldid, 'newid', $this->mNewid );
+ return $wgMemc->makeKey(
+ 'diff',
+ 'inline',
+ self::DIFF_VERSION,
+ 'oldid',
+ $this->mOldid,
+ 'newid',
+ $this->mNewid
+ );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/375424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13c619ab4aedc9f9d4208ba62098cb27b41c283e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
