From 159abcd168d6e8dacab0ffbce9bcc97910eaab16 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 1 Oct 2014 10:10:07 -0700
Subject: [PATCH] Removed $wgPageShowWatchingUsers

Change-Id: I1e3d17f1954c7b4427a22cd9a781012061d3e710
---
 RELEASE-NOTES-1.25              |  1 +
 includes/DefaultSettings.php    |  5 -----
 includes/skins/SkinTemplate.php | 15 +--------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index e5a6cd1a1b..20bc782c18 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -9,6 +9,7 @@ MediaWiki 1.25 is an alpha-quality branch and is not recommended for use in
 production.
 
 === Configuration changes in 1.25 ===
+* $wgPageShowWatchingUsers was removed.
 
 === New features in 1.25 ===
 * (bug 58139) ResourceLoaderFileModule now supports language fallback
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e9b57465fe..d1bbc366d1 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5885,11 +5885,6 @@ $wgAdvertisedFeedTypes = array( 'atom' );
  */
 $wgRCShowWatchingUsers = false; # UPO
 
-/**
- * Show watching users in Page views
- */
-$wgPageShowWatchingUsers = false;
-
 /**
  * Show the amount of changed characters in recent changes
  */
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 64ad816ac1..c1db302ded 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -261,7 +261,7 @@ class SkinTemplate extends Skin {
 	protected function prepareQuickTemplate() {
 		global $wgContLang, $wgScript, $wgStylePath, $wgMimeType, $wgJsMimeType,
 			$wgDisableCounters, $wgSitename, $wgLogo, $wgMaxCredits,
-			$wgShowCreditsIfMax, $wgPageShowWatchingUsers, $wgArticlePath,
+			$wgShowCreditsIfMax, $wgArticlePath,
 			$wgScriptPath, $wgServer;
 
 		wfProfileIn( __METHOD__ );
@@ -386,19 +386,6 @@ class SkinTemplate extends Skin {
 					}
 				}
 
-				if ( $wgPageShowWatchingUsers ) {
-					$dbr = wfGetDB( DB_SLAVE );
-					$num = $dbr->selectField( 'watchlist', 'COUNT(*)',
-						array( 'wl_title' => $title->getDBkey(), 'wl_namespace' => $title->getNamespace() ),
-						__METHOD__
-					);
-					if ( $num > 0 ) {
-						$tpl->set( 'numberofwatchingusers',
-							$this->msg( 'number_of_watching_users_pageview' )->numParams( $num )->parse()
-						);
-					}
-				}
-
 				if ( $wgMaxCredits != 0 ) {
 					$tpl->set( 'credits', Action::factory( 'credits', $this->getWikiPage(),
 						$this->getContext() )->getCredits( $wgMaxCredits, $wgShowCreditsIfMax ) );
-- 
2.20.1