From b1e61d9a8079c7eef233e2b1a62eebf2f64114d1 Mon Sep 17 00:00:00 2001 From: Kevin Israel Date: Mon, 28 Sep 2015 19:15:49 -0400 Subject: [PATCH] dumpBackup.php: Remove --force-normal option The code handling this option, added in r14151 / 64cbfd80b576, used to call dl() to allow use of the utfnormal library's custom PHP extension even if it is not enabled in php.ini. That part was removed in 1.22 (d0c8ba037cf6). And as pointed out by Ariel Glenn[1], the utfnormal library later dropped support for that PHP extension in 6c61fd7c7843 (in favor of intl, which had already been supported since 1.17 (r69626 / f08147c313f5)), so there is now no reason whatsoever to check for utf8_normalize(). The option will now be treated like any other unrecognized option and will be silently ignored. [1]: https://phabricator.wikimedia.org/T94277#1680209 Change-Id: I467bf609fda6e923fd2d654400d8e1b6c3714d96 --- RELEASE-NOTES-1.27 | 2 ++ maintenance/backup.inc | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27 index f674d598d3..1b74f52ed4 100644 --- a/RELEASE-NOTES-1.27 +++ b/RELEASE-NOTES-1.27 @@ -190,6 +190,8 @@ changes to languages because of Phabricator reports. * OutputPage::loginToUse() was removed (deprecated since 1.19). * Article::loadContent() was removed (deprecated since 1.19). * User::editToken() was removed (deprecated since 1.19). +* Removed --force-normal option of dumpBackup.php, as it no longer served + any useful purpose since 1.22. == Compatibility == diff --git a/maintenance/backup.inc b/maintenance/backup.inc index 6e1ddb4ee7..93010ae89b 100644 --- a/maintenance/backup.inc +++ b/maintenance/backup.inc @@ -174,12 +174,6 @@ class BackupDumper { case "server": $this->server = $val; break; - case "force-normal": - if ( !function_exists( 'utf8_normalize' ) ) { - $this->fatalError( "UTF-8 normalization extension not loaded. " . - "Install or remove --force-normal parameter to use slower code." ); - } - break; default: $this->processOption( $opt, $val, $param ); } -- 2.20.1