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

Follow-up If8dfdaf1: Hard-deprecate, drop two uses, other pre-5.3 back-compat code

Browse source 
Change-Id: I1c5eee3fe30d6687d88e07011a3d40b6770d0daf
This commit is contained in:
James D. Forrester 2018-05-24 17:01:02 -07:00
parent cfe2299a4e
commit 70c711a6bc
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/collation/IcuCollation.php
View file

@ -535,6 +535,7 @@ class IcuCollation extends Collation {
* @return string
*/
static function getICUVersion() {
wfDeprecated( __METHOD__, '1.32' );
return INTL_ICU_VERSION;
}

4
includes/specials/SpecialVersion.php
View file

@ -233,9 +233,7 @@ class SpecialVersion extends SpecialPage {
}
$software[$dbr->getSoftwareLink()] = $dbr->getServerInfo();
if ( IcuCollation::getICUVersion() ) {
$software['[http://site.icu-project.org/ ICU]'] = IcuCollation::getICUVersion();
}
$software['[http://site.icu-project.org/ ICU]'] = INTL_ICU_VERSION;
// Allow a hook to add/remove items.
Hooks::run( 'SoftwareInfo', [ &$software ] );

13
maintenance/language/generateCollationData.php
View file

@ -71,7 +71,7 @@ class GenerateCollationData extends Maintenance {
$ucdallURL = "https://www.unicode.org/Public/<Unicode version>/ucdxml/ucd.all.grouped.zip";
if ( !$allkeysPresent || !$ucdallPresent ) {
$icuVersion = IcuCollation::getICUVersion();
$icuVersion = INTL_ICU_VERSION;
$unicodeVersion = IcuCollation::getUnicodeVersionForICU();
$error = "";
@ -88,16 +88,7 @@ class GenerateCollationData extends Maintenance {
}
$versionKnown = false;
if ( !$icuVersion ) {
// Unknown version - either very old intl,
// or PHP < 5.3.7 which does not expose this information
$error .= "As MediaWiki could not determine the version of ICU library used by your PHP's "
. "intl extension it can't suggest which file version to download. "
. "This can be caused by running a very old version of intl or PHP < 5.3.7. "
. "If you are sure everything is all right, find out the ICU version "
. "by running phpinfo(), check what is the Unicode version it is using "
. "at http://site.icu-project.org/download, then try finding appropriate data file(s) at:";
} elseif ( version_compare( $icuVersion, "4.0", "<" ) ) {
if ( version_compare( $icuVersion, "4.0", "<" ) ) {
// Extra old version
$error .= "You are using outdated version of ICU ($icuVersion), intended for "
. ( $unicodeVersion ? "Unicode $unicodeVersion" : "an unknown version of Unicode" )