They were deprecated in version 1.17.
Change-Id: I8489c0cb4a041d081283fa3551377ef81ef36549
* $wgFileStore was removed after having been deprecated in 1.17. Alternative
configurations are $wgDeletedDirectory and $wgHashedUploadDirectory.
* The deprecated $wgUseCommaCount variable has been removed.
+* $wgEnableSorbs and $wgSorbsUrl have been removed.
=== New features in 1.24 ===
* Added a new hook, "WhatLinksHereProps", to allow extensions to annotate
*/
$wgEnableDnsBlacklist = false;
-/**
- * @deprecated since 1.17 Use $wgEnableDnsBlacklist instead, only kept for
- * backward compatibility.
- */
-$wgEnableSorbs = false;
-
/**
* List of DNS blacklists to use, if $wgEnableDnsBlacklist is true.
*
*/
$wgDnsBlacklistUrls = array( 'http.dnsbl.sorbs.net.' );
-/**
- * @deprecated since 1.17 Use $wgDnsBlacklistUrls instead, only kept for
- * backward compatibility.
- */
-$wgSorbsUrl = array();
-
/**
* Proxy whitelist, list of addresses that are assumed to be non-proxy despite
* what the other methods might say.
* @return bool True if blacklisted.
*/
public function isDnsBlacklisted( $ip, $checkWhitelist = false ) {
- global $wgEnableSorbs, $wgEnableDnsBlacklist,
- $wgSorbsUrl, $wgDnsBlacklistUrls, $wgProxyWhitelist;
+ global $wgEnableDnsBlacklist, $wgDnsBlacklistUrls, $wgProxyWhitelist;
- if ( !$wgEnableDnsBlacklist && !$wgEnableSorbs ) {
+ if ( !$wgEnableDnsBlacklist ) {
return false;
}
return false;
}
- $urls = array_merge( $wgDnsBlacklistUrls, (array)$wgSorbsUrl );
- return $this->inDnsBlacklist( $ip, $urls );
+ return $this->inDnsBlacklist( $ip, $wgDnsBlacklistUrls );
}
/**