* --force-normal parameter on dump scripts to force check for ICU extension

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4d7f269..9f11458 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -236,6 +236,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5697) Update for Malay language (ms)
 * (bug 5890) Update for German language (de)
 * (bug 5889) Name for Sindhi language should appear as سنڌي
+* --force-normal parameter on dump scripts to force check for ICU extension
+
 
 == Compatibility ==
 

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index 6b7150d..02c158b 100644 (file)
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -130,6 +130,15 @@ class BackupDumper {
                                case "server":
                                        $this->server = $val;
                                        break;
+                               case "force-normal":
+                                       if( !function_exists( 'utf8_normalize' ) ) {
+                                               dl( "php_utfnormal.so" );
+                                               if( !function_exists( 'utf8_normalize' ) ) {
+                                                       wfDie( "Failed to load UTF-8 normalization extension. " .
+                                                               "Install or remove --force-normal parameter to use slower code.\n" );
+                                               }
+                                       }
+                                       break;
                                default:
                                        $this->processOption( $opt, $val, $param );
                                }