From cdbf6c434d5ba340994674847dfeb7e94ce7fe7c Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 5 Oct 2012 20:53:22 +0200
Subject: [PATCH] Remove deprecated $wgAllowRealName

Deprecated since 1.16, which is out of lifecycle since August 2011

Change-Id: Ie48a4116eab9d07bc435ea9ce784762313b757cb
---
 RELEASE-NOTES-1.21           | 1 +
 includes/DefaultSettings.php | 7 -------
 includes/Setup.php           | 6 ------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 50c3b2d83e..66c3859cd0 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -12,6 +12,7 @@ production.
 
 === Configuration changes in 1.21 ===
 * (bug 29374) $wgVectorUseSimpleSearch is now enabled by default.
+* Deprecated $wgAllowRealName is removed. Use $wgHiddenPrefs[] = 'realname' instead
 
 === New features in 1.21 ===
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8de981c6c5..28f9aeae98 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3594,13 +3594,6 @@ $wgDefaultUserOptions = array(
 	'wllimit'                 => 250,
 );
 
-/**
- * Whether or not to allow and use real name fields.
- * @deprecated since 1.16, use $wgHiddenPrefs[] = 'realname' below to disable real
- * names
- */
-$wgAllowRealName = true;
-
 /** An array of preferences to not show for the user */
 $wgHiddenPrefs = array();
 
diff --git a/includes/Setup.php b/includes/Setup.php
index 5c5d7d141f..83ca516f06 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -317,12 +317,6 @@ if ( $wgUseFileCache || $wgUseSquid ) {
 	$wgDebugToolbar = false;
 }
 
-# $wgAllowRealName and $wgAllowUserSkin were removed in 1.16
-# in favor of $wgHiddenPrefs, handle b/c here
-if ( !$wgAllowRealName ) {
-	$wgHiddenPrefs[] = 'realname';
-}
-
 # Doesn't make sense to have if disabled.
 if ( !$wgEnotifMinorEdits ) {
 	$wgHiddenPrefs[] = 'enotifminoredits';
-- 
2.20.1