jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403847 )
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: Ifb4607d329402f900b3106d0b6cb6ec53dcb3a27
---
M includes/BlogPage.class.php
M includes/BlogPage.hooks.php
M includes/specials/SpecialArticleLists.php
M includes/specials/SpecialArticlesHome.php
4 files changed, 17 insertions(+), 17 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/BlogPage.class.php b/includes/BlogPage.class.php
index 817299e..0c31601 100644
--- a/includes/BlogPage.class.php
+++ b/includes/BlogPage.class.php
@@ -195,7 +195,7 @@
global $wgMemc;
// Try memcached first
- $key = wfMemcKey( 'page', 'create_date', $pageId );
+ $key = $wgMemc->makeKey( 'page', 'create_date', $pageId );
$data = $wgMemc->get( $key );
if ( !$data ) {
@@ -397,7 +397,7 @@
$articles = array();
// Try cache first
- $key = wfMemcKey( 'blog', 'author', 'articles', $user_id );
+ $key = $wgMemc->makeKey( 'blog', 'author', 'articles', $user_id
);
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -503,7 +503,7 @@
$pageTitleId = $this->getId();
- $key = wfMemcKey( 'recenteditors', 'list', $pageTitleId );
+ $key = $wgMemc->makeKey( 'recenteditors', 'list', $pageTitleId
);
$data = $wgMemc->get( $key );
$editors = array();
@@ -596,7 +596,7 @@
// Gets the page ID for the query
$pageTitleId = $this->getId();
- $key = wfMemcKey( 'recentvoters', 'list', $pageTitleId );
+ $key = $wgMemc->makeKey( 'recentvoters', 'list', $pageTitleId );
$data = $wgMemc->get( $key );
$voters = array();
@@ -716,7 +716,7 @@
}
// Try cache first
- $key = wfMemcKey( 'blog', 'popular', 'five' );
+ $key = $wgMemc->makeKey( 'blog', 'popular', 'five' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -804,7 +804,7 @@
}
// Try cache first
- $key = wfMemcKey( 'blog', 'new', 'five' );
+ $key = $wgMemc->makeKey( 'blog', 'new', 'five' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -950,7 +950,7 @@
global $wgMemc;
// Try cache first
- $key = wfMemcKey( 'blog', 'comments', 'count', 'pageid-' . $id
);
+ $key = $wgMemc->makeKey( 'blog', 'comments', 'count', 'pageid-'
. $id );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -983,7 +983,7 @@
global $wgMemc;
// Try cache first
- $key = wfMemcKey( 'blog', 'vote', 'count', 'pageid-' . $id );
+ $key = $wgMemc->makeKey( 'blog', 'vote', 'count', 'pageid-' .
$id );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -1103,7 +1103,7 @@
public static function getPageImage( $pageId ) {
global $wgMemc;
- $key = wfMemcKey( 'blog', 'page', 'image', $pageId );
+ $key = $wgMemc->makeKey( 'blog', 'page', 'image', $pageId );
$data = $wgMemc->get( $key );
if ( !$data ) {
diff --git a/includes/BlogPage.hooks.php b/includes/BlogPage.hooks.php
index da61042..a0ac3c6 100644
--- a/includes/BlogPage.hooks.php
+++ b/includes/BlogPage.hooks.php
@@ -190,7 +190,7 @@
$output = '';
// Try cache first
- $key = wfMemcKey( 'user', 'profile', 'articles',
$userProfile->user_id );
+ $key = $wgMemc->makeKey( 'user', 'profile', 'articles',
$userProfile->user_id );
$data = $wgMemc->get( $key );
$articles = array();
diff --git a/includes/specials/SpecialArticleLists.php
b/includes/specials/SpecialArticleLists.php
index 28f5917..63d2fad 100644
--- a/includes/specials/SpecialArticleLists.php
+++ b/includes/specials/SpecialArticleLists.php
@@ -50,7 +50,7 @@
}
// Try cache first
- $key = wfMemcKey( 'blog', 'new', 'twentyfive' );
+ $key = $wgMemc->makeKey( 'blog', 'new', 'twentyfive' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
diff --git a/includes/specials/SpecialArticlesHome.php
b/includes/specials/SpecialArticlesHome.php
index cf1c2ec..f18b9f9 100644
--- a/includes/specials/SpecialArticlesHome.php
+++ b/includes/specials/SpecialArticlesHome.php
@@ -142,7 +142,7 @@
global $wgMemc, $wgExtensionAssetsPath;
// Try cache first
- $key = wfMemcKey( 'blog', 'popular', 'twentyfive' );
+ $key = $wgMemc->makeKey( 'blog', 'popular', 'twentyfive' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -268,7 +268,7 @@
global $wgMemc;
// Try cache first
- $key = wfMemcKey( 'blog', 'mostvoted', 'ten' );
+ $key = $wgMemc->makeKey( 'blog', 'mostvoted', 'ten' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -359,7 +359,7 @@
global $wgMemc;
// Try cache first
- $key = wfMemcKey( 'blog', 'mostcommented', 'ten' );
+ $key = $wgMemc->makeKey( 'blog', 'mostcommented', 'ten' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -445,7 +445,7 @@
global $wgMemc;
// Try cache first
- $key = wfMemcKey( 'blog', 'newest', 'ten' );
+ $key = $wgMemc->makeKey( 'blog', 'newest', 'ten' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -517,7 +517,7 @@
global $wgMemc, $wgExtensionAssetsPath;
// Try cache first
- $key = wfMemcKey( 'blog', 'newest', 'twentyfive' );
+ $key = $wgMemc->makeKey( 'blog', 'newest', 'twentyfive' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
@@ -634,7 +634,7 @@
global $wgMemc;
// Try cache first
- $key = wfMemcKey( 'blog', 'popular', 'ten' );
+ $key = $wgMemc->makeKey( 'blog', 'popular', 'ten' );
$data = $wgMemc->get( $key );
if ( $data != '' ) {
--
To view, visit https://gerrit.wikimedia.org/r/403847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb4607d329402f900b3106d0b6cb6ec53dcb3a27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Lewis Cawte <[email protected]>
Gerrit-Reviewer: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: UltrasonicNXT <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
