jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404143 )
Change subject: Remove a few leftover uses of the deprecated wfMemcKey function ...................................................................... Remove a few leftover uses of the deprecated wfMemcKey function I didn't see that there were actually a few uses of the wfMemcKey left after, so this takes care of those few leftovers. Follows-up: Icad1be17fc1426d0defbe8e65d2d127e3d7dc737 Change-Id: If34dfc1f27f63d4e290eddfffdf541964f3e0442 --- M UserProfile/UserProfileClass.php M UserStats/SpecialUpdateEditCounts.php M UserStats/TopFansByStat.php M UserStats/TopFansRecent.php M UserStats/TopUsers.php M UserStats/UserStats.php M UserStats/UserStatsTrack.php 7 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/UserProfile/UserProfileClass.php b/UserProfile/UserProfileClass.php index 5ee5afd..5f93280 100644 --- a/UserProfile/UserProfileClass.php +++ b/UserProfile/UserProfileClass.php @@ -73,7 +73,7 @@ static function clearCache( $user_id ) { global $wgMemc; - $key = wfMemcKey( 'user', 'profile', 'info', $user_id ); + $key = $wgMemc->makeKey( 'user', 'profile', 'info', $user_id ); $wgMemc->delete( $key ); } @@ -90,7 +90,7 @@ $user->loadFromId(); // Try cache first - $key = wfMemcKey( 'user', 'profile', 'info', $this->user_id ); + $key = $wgMemc->makeKey( 'user', 'profile', 'info', $this->user_id ); $data = $wgMemc->get( $key ); if ( $data ) { wfDebug( "Got user profile info for {$this->user_name} from cache\n" ); diff --git a/UserStats/SpecialUpdateEditCounts.php b/UserStats/SpecialUpdateEditCounts.php index a9fbbc3..248e157 100644 --- a/UserStats/SpecialUpdateEditCounts.php +++ b/UserStats/SpecialUpdateEditCounts.php @@ -91,7 +91,7 @@ global $wgMemc; // clear stats cache for current user - $key = wfMemcKey( 'user', 'stats', $row->rev_user ); + $key = $wgMemc->makeKey( 'user', 'stats', $row->rev_user ); $wgMemc->delete( $key ); } } diff --git a/UserStats/TopFansByStat.php b/UserStats/TopFansByStat.php index 0bdd7db..9e443bf 100644 --- a/UserStats/TopFansByStat.php +++ b/UserStats/TopFansByStat.php @@ -64,7 +64,7 @@ // Get the list of users // Try cache - $key = wfMemcKey( 'user_stats', 'top', $statistic, $realCount ); + $key = $wgMemc->makeKey( 'user_stats', 'top', $statistic, $realCount ); $data = $wgMemc->get( $key ); if ( $data != '' ) { diff --git a/UserStats/TopFansRecent.php b/UserStats/TopFansRecent.php index 0d3d114..f521be0 100644 --- a/UserStats/TopFansRecent.php +++ b/UserStats/TopFansRecent.php @@ -64,7 +64,7 @@ $user_list = array(); // Try cache - $key = wfMemcKey( 'user_stats', $period, 'points', $realCount ); + $key = $wgMemc->makeKey( 'user_stats', $period, 'points', $realCount ); $data = $wgMemc->get( $key ); if ( $data != '' ) { diff --git a/UserStats/TopUsers.php b/UserStats/TopUsers.php index 4bfa373..0b21433 100644 --- a/UserStats/TopUsers.php +++ b/UserStats/TopUsers.php @@ -34,7 +34,7 @@ $user_list = array(); // Try cache - $key = wfMemcKey( 'user_stats', 'top', 'points', $realcount ); + $key = $wgMemc->makeKey( 'user_stats', 'top', 'points', $realcount ); $data = $wgMemc->get( $key ); if ( $data != '' ) { diff --git a/UserStats/UserStats.php b/UserStats/UserStats.php index 42aa76b..8842f2e 100644 --- a/UserStats/UserStats.php +++ b/UserStats/UserStats.php @@ -52,7 +52,7 @@ */ public function getUserStatsCache() { global $wgMemc; - $key = wfMemcKey( 'user', 'stats', $this->user_id ); + $key = $wgMemc->makeKey( 'user', 'stats', $this->user_id ); $data = $wgMemc->get( $key ); if ( $data ) { wfDebug( "Got user stats for {$this->user_name} from cache\n" ); @@ -110,7 +110,7 @@ $stats['points'] = '1000'; } - $key = wfMemcKey( 'user', 'stats', $this->user_id ); + $key = $wgMemc->makeKey( 'user', 'stats', $this->user_id ); $wgMemc->set( $key, $stats ); return $stats; } diff --git a/UserStats/UserStatsTrack.php b/UserStats/UserStatsTrack.php index eeac4ff..4cef914 100644 --- a/UserStats/UserStatsTrack.php +++ b/UserStats/UserStatsTrack.php @@ -106,7 +106,7 @@ global $wgMemc; // clear stats cache for current user - $key = wfMemcKey( 'user', 'stats', $this->user_id ); + $key = $wgMemc-makeKey( 'user', 'stats', $this->user_id ); $wgMemc->delete( $key ); } @@ -150,7 +150,7 @@ $stat_field = $this->stats_fields[$field]; $field_count = $s->$stat_field; - $key = wfMemcKey( 'system_gift', 'id', $field . '-' . $field_count ); + $key = $wgMemc-makeKey( 'system_gift', 'id', $field . '-' . $field_count ); $data = $wgMemc->get( $key ); if ( $data ) { -- To view, visit https://gerrit.wikimedia.org/r/404143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If34dfc1f27f63d4e290eddfffdf541964f3e0442 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SocialProfile Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen <samanthanguyen1...@gmail.com> Gerrit-Reviewer: Jack Phoenix <ash...@uncyclomedia.co> Gerrit-Reviewer: Lewis Cawte <le...@lewiscawte.me> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits