From: withoutaname <drevitchi@gmail.com>
Date: Wed, 11 Jun 2014 20:47:03 +0000 (-0700)
Subject: Remove $wgProxyKey
X-Git-Tag: 1.31.0-rc.0~15395^2
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=5e48ad2e78ce2291dd820dc2a0fd2bed1fa8e5f9;p=lhc%2Fweb%2Fwiklou.git

Remove $wgProxyKey

Change-Id: I1748164f108fab701c79532ede13ae387b12769d
---

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index baf69c5ab3..9d74e8686a 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -472,6 +472,7 @@ changes to languages because of Bugzilla reports.
 
 ==== Removed globals ====
 * $wgBetterDirectionality (deprecated in 1.18)
+* $wgProxyKey (deprecated in 1.14)
 
 == Compatibility ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f9cafc951f..6e967390cb 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4826,11 +4826,6 @@ $wgSecretKey = false;
  */
 $wgProxyList = array();
 
-/**
- * @deprecated since 1.14
- */
-$wgProxyKey = false;
-
 /** @} */ # end of proxy scanner settings
 
 /************************************************************************//**
diff --git a/includes/utils/MWCryptRand.php b/includes/utils/MWCryptRand.php
index 0172974d6a..eb74d127ad 100644
--- a/includes/utils/MWCryptRand.php
+++ b/includes/utils/MWCryptRand.php
@@ -134,12 +134,10 @@ class MWCryptRand {
 		// It's mostly worthless but throw the wiki's id into the data for a little more variance
 		$state .= wfWikiID();
 
-		// If we have a secret key or proxy key set then throw it into the state as well
-		global $wgSecretKey, $wgProxyKey;
+		// If we have a secret key set then throw it into the state as well
+		global $wgSecretKey;
 		if ( $wgSecretKey ) {
 			$state .= $wgSecretKey;
-		} elseif ( $wgProxyKey ) {
-			$state .= $wgProxyKey;
 		}
 
 		return $state;