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

Merge "Setup: Remove compat for $wgUseSquid and friends"

Browse source
This commit is contained in:
jenkins-bot 2020-03-15 00:14:01 +00:00 committed by Gerrit Code Review
commit 0500773a9e
2 changed files with 3 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RELEASE-NOTES-1.35
View file

@ -78,6 +78,9 @@ For notes on 1.34.x and older releases, see HISTORY.
produced via $wgDebugComments, if enabled.
* $wgSkipSkin - This setting, deprecated in 1.23, was removed. To disable a
skin from being shown, use $wgSkipSkins.
* $wgUseSquid, $wgSquidServers, $wgSquidServersNoPurge, and $wgSquidMaxage,
deprecated in 1.34, have been removed. Use $wgUseCdn, $wgCdnServers,
$wgCdnServersNoPurge, or $wgCdnMaxAge instead.
* $wgMaxGeneratedPPNodeCount - This setting was removed. It only affected
Preprocessor_DOM, which was deprecated in 1.34 and removed in this release.
* $wgFixArabicUnicode and $wgFixMalayalamUnicode, deprecated in 1.33, were

52
includes/Setup.php
View file

@ -474,58 +474,6 @@ foreach ( LanguageCode::getNonstandardLanguageCodeMapping() as $code => $bcp47 )
// To determine the user language, use $wgLang->getCode()
$wgContLanguageCode = $wgLanguageCode;
// Temporary backwards-compatibility reading of old Squid-named CDN settings as of MediaWiki 1.34,
// to support sysadmins who fail to update their settings immediately:
if ( isset( $wgUseSquid ) ) {
// If the sysadmin is still setting a value of $wgUseSquid to true but $wgUseCdn is the default of
// false, to be safe, assume they do want this still, so enable it.
if ( !$wgUseCdn && $wgUseSquid ) {
$wgUseCdn = $wgUseSquid;
wfDeprecated( '$wgUseSquid enabled but $wgUseCdn disabled; enabling CDN functions', '1.34' );
}
} else {
// Backwards-compatibility for extensions that read this value.
$wgUseSquid = $wgUseCdn;
}
if ( isset( $wgSquidServers ) ) {
// If the sysadmin is still setting a value of $wgSquidServers but $wgCdnServers is the default of
// empty, to be safe, assume they do want these servers to be still used, so use them.
if ( !empty( $wgSquidServers ) && empty( $wgCdnServers ) ) {
$wgCdnServers = $wgSquidServers;
wfDeprecated( '$wgSquidServers set, $wgCdnServers empty; using them', '1.34' );
}
} else {
// Backwards-compatibility for extensions that read this value.
$wgSquidServers = $wgCdnServers;
}
if ( isset( $wgSquidServersNoPurge ) ) {
// If the sysadmin is still setting values in $wgSquidServersNoPurge but $wgCdnServersNoPurge is
// the default of empty, to be safe, assume they do want these servers to be still used, so use
// them.
if ( !empty( $wgSquidServersNoPurge ) && empty( $wgCdnServersNoPurge ) ) {
$wgCdnServersNoPurge = $wgSquidServersNoPurge;
wfDeprecated( '$wgSquidServersNoPurge set, $wgCdnServersNoPurge empty; using them', '1.34' );
}
} else {
// Backwards-compatibility for extensions that read this value.
$wgSquidServersNoPurge = $wgCdnServersNoPurge;
}
if ( isset( $wgSquidMaxage ) ) {
// If the sysadmin is still setting a value of $wgSquidMaxage and it's higher than $wgCdnMaxAge,
// to be safe, assume they want the higher (lower performance requirement) value, so use that.
if ( $wgCdnMaxAge < $wgSquidMaxage ) {
$wgCdnMaxAge = $wgSquidMaxage;
wfDeprecated( '$wgSquidMaxage set higher than $wgCdnMaxAge; using the higher value', '1.34' );
}
} else {
// Backwards-compatibility for extensions that read this value.
$wgSquidMaxage = $wgCdnMaxAge;
}
// Blacklisted file extensions shouldn't appear on the "allowed" list
$wgFileExtensions = array_values( array_diff( $wgFileExtensions, $wgFileBlacklist ) );