Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove $wgProxyKey

Browse source 
Change-Id: I1748164f108fab701c79532ede13ae387b12769d
This commit is contained in:
withoutaname 2014-06-11 13:47:03 -07:00
parent 46f0261af0
commit 5e48ad2e78
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RELEASE-NOTES-1.23
View file

@ -472,6 +472,7 @@ changes to languages because of Bugzilla reports.
==== Removed globals ==== ==== Removed globals ====
* $wgBetterDirectionality (deprecated in 1.18) * $wgBetterDirectionality (deprecated in 1.18)
* $wgProxyKey (deprecated in 1.14)
== Compatibility == == Compatibility ==

5
includes/DefaultSettings.php
View file

@ -4826,11 +4826,6 @@ $wgSecretKey = false;
*/ */
$wgProxyList = array(); $wgProxyList = array();
/**
* @deprecated since 1.14
*/
$wgProxyKey = false;
/** @} */ # end of proxy scanner settings /** @} */ # end of proxy scanner settings
/************************************************************************//** /************************************************************************//**

6
includes/utils/MWCryptRand.php
View file

@ -134,12 +134,10 @@ class MWCryptRand {
// It's mostly worthless but throw the wiki's id into the data for a little more variance // It's mostly worthless but throw the wiki's id into the data for a little more variance
$state .= wfWikiID(); $state .= wfWikiID();
// If we have a secret key or proxy key set then throw it into the state as well // If we have a secret key set then throw it into the state as well
global $wgSecretKey, $wgProxyKey; global $wgSecretKey;
if ( $wgSecretKey ) { if ( $wgSecretKey ) {
$state .= $wgSecretKey; $state .= $wgSecretKey;
} elseif ( $wgProxyKey ) {
$state .= $wgProxyKey;
} }
return $state; return $state;