jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403868 )
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: I23499cc349687d9f1fab97f014afd35900531d21
---
M includes/Vote.class.php
M includes/VoteNY.hooks.php
M includes/specials/SpecialTopRatings.php
3 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Vote.class.php b/includes/Vote.class.php
index dcd6aaa..0c1e1d7 100644
--- a/includes/Vote.class.php
+++ b/includes/Vote.class.php
@@ -36,7 +36,7 @@
function count() {
global $wgMemc;
- $key = wfMemcKey( 'vote', 'count', $this->PageID );
+ $key = $wgMemc->makeKey( 'vote', 'count', $this->PageID );
$data = $wgMemc->get( $key );
// Try cache
@@ -69,7 +69,8 @@
*/
function getAverageVote() {
global $wgMemc;
- $key = wfMemcKey( 'vote', 'avg', $this->PageID );
+
+ $key = $wgMemc->makeKey( 'vote', 'avg', $this->PageID );
$data = $wgMemc->get( $key );
$voteAvg = 0;
@@ -101,8 +102,8 @@
global $wgUser, $wgMemc;
// Kill internal cache
- $wgMemc->delete( wfMemcKey( 'vote', 'count', $this->PageID ) );
- $wgMemc->delete( wfMemcKey( 'vote', 'avg', $this->PageID ) );
+ $wgMemc->delete( $wgMemc->makeKey( 'vote', 'count',
$this->PageID ) );
+ $wgMemc->delete( $wgMemc->makeKey( 'vote', 'avg', $this->PageID
) );
// Purge squid
$pageTitle = Title::newFromID( $this->PageID );
diff --git a/includes/VoteNY.hooks.php b/includes/VoteNY.hooks.php
index c6e3193..8c8994a 100644
--- a/includes/VoteNY.hooks.php
+++ b/includes/VoteNY.hooks.php
@@ -98,7 +98,7 @@
global $wgMemc;
if ( $magicWordId == 'NUMBEROFVOTES' ) {
- $key = wfMemcKey( 'vote', 'magic-word' );
+ $key = $wgMemc->makeKey( 'vote', 'magic-word' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
// We have it in cache? Oh goody, let's just
use the cached value!
@@ -142,7 +142,7 @@
$id = $title->getArticleID();
- $key = wfMemcKey( 'vote', 'magic-word-page', $id );
+ $key = $wgMemc->makeKey( 'vote', 'magic-word-page', $id );
$data = $wgMemc->get( $key );
if ( $data ) {
diff --git a/includes/specials/SpecialTopRatings.php
b/includes/specials/SpecialTopRatings.php
index 01dc14c..5d73c2e 100644
--- a/includes/specials/SpecialTopRatings.php
+++ b/includes/specials/SpecialTopRatings.php
@@ -9,7 +9,6 @@
*
* @file
* @ingroup Extensions
- * @date 11 December 2011
* @license To the extent that it is possible, this code is in the public
domain
*/
class SpecialTopRatings extends IncludableSpecialPage {
@@ -171,7 +170,7 @@
public static function getAverageRatingForPage( $pageId ) {
global $wgMemc;
- $key = wfMemcKey( 'vote', 'avg', $pageId );
+ $key = $wgMemc->makeKey( 'vote', 'avg', $pageId );
$data = $wgMemc->get( $key );
$voteAvg = 0;
--
To view, visit https://gerrit.wikimedia.org/r/403868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23499cc349687d9f1fab97f014afd35900531d21
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VoteNY
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
