jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403849 )
Change subject: wfMemcKey (deprecated in MW 1.30) -> makeKey() on a BagOStuff
instance
......................................................................
wfMemcKey (deprecated in MW 1.30) -> makeKey() on a BagOStuff instance
Change-Id: I339c54648cf555f54226135793e7d478ff84d3a8
---
M includes/FanBox.class.php
M includes/UserBoxes.hooks.php
2 files changed, 4 insertions(+), 6 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/FanBox.class.php b/includes/FanBox.class.php
index bfb4f02..b86fe60 100644
--- a/includes/FanBox.class.php
+++ b/includes/FanBox.class.php
@@ -206,7 +206,7 @@
array( 'fantag_pg_id' => intval( $fanboxId ) ),
__METHOD__
);
- $key = wfMemcKey( 'fantag', 'page', $this->name );
+ $key = $wgMemc->makeKey( 'fantag', 'page', $this->name );
$wgMemc->delete( $key );
$categories_wiki = '';
@@ -279,10 +279,9 @@
private function loadFromCache() {
global $wgMemc;
- wfProfileIn( __METHOD__ );
$this->dataLoaded = false;
- $key = wfMemcKey( 'fantag', 'page', $this->name );
+ $key = $wgMemc->makeKey( 'fantag', 'page', $this->name );
$data = $wgMemc->get( $key );
if ( !empty( $data ) && is_array( $data ) ) {
@@ -310,7 +309,6 @@
wfIncrStats( 'fantag_cache_miss' );
}
- wfProfileOut( __METHOD__ );
return $this->dataLoaded;
}
@@ -320,7 +318,7 @@
private function saveToCache() {
global $wgMemc;
- $key = wfMemcKey( 'fantag', 'page', $this->name );
+ $key = $wgMemc->makeKey( 'fantag', 'page', $this->name );
if ( $this->exists() ) {
$cachedValues = array(
'id' => $this->id,
diff --git a/includes/UserBoxes.hooks.php b/includes/UserBoxes.hooks.php
index 64fe958..3da627b 100644
--- a/includes/UserBoxes.hooks.php
+++ b/includes/UserBoxes.hooks.php
@@ -45,7 +45,7 @@
$f = new UserFanBoxes( $user_name );
// Try cache
- //$key = wfMemcKey( 'user', 'profile', 'fanboxes', $f->user_id
);
+ //$key = $wgMemc->makeKey( 'user', 'profile', 'fanboxes',
$f->user_id );
//$data = $wgMemc->get( $key );
//if ( !$data ) {
--
To view, visit https://gerrit.wikimedia.org/r/403849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I339c54648cf555f54226135793e7d478ff84d3a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <[email protected]>
Gerrit-Reviewer: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
