From d9705e6dbcb7a4c54f71f83f688a1ecfa01ccb6b Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Wed, 31 Jan 2018 14:32:41 -0800
Subject: [PATCH] Remove Skin::showIPinHeader(), deprecated since 1.27

Change-Id: I46e5f84512413c9c4fbdfa43abf8908d6a6e11be
---
 RELEASE-NOTES-1.31      | 1 +
 includes/skins/Skin.php | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 9beaa8910d..e8b4422fcd 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -206,6 +206,7 @@ changes to languages because of Phabricator reports.
   * OutputPage::setSquidMaxage(); deprecated in 1.27
   * OutputPage::readOnlyPage(); deprecated in 1.25
   * OutputPage::rateLimited(); deprecated in 1.25
+* The no-op method Skin::showIPinHeader(), deprecated in 1.27, was removed.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is supported,
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index c95f1f502c..bd43255965 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -767,15 +767,6 @@ abstract class Skin extends ContextSource {
 		return $subpages;
 	}
 
-	/**
-	 * @deprecated since 1.27, feature removed
-	 * @return bool Always false
-	 */
-	function showIPinHeader() {
-		wfDeprecated( __METHOD__, '1.27' );
-		return false;
-	}
-
 	/**
 	 * @return string
 	 */
-- 
2.20.1