Merge "Don't modify $wgHooks on language object construction"

[lhc/web/wiklou.git] / maintenance / language / generateUtf8Case.php

diff --git a/maintenance/language/generateUtf8Case.php b/maintenance/language/generateUtf8Case.php
index 0fd3242..676297e 100644 (file)
--- a/maintenance/language/generateUtf8Case.php
+++ b/maintenance/language/generateUtf8Case.php
@@ -37,8 +37,8 @@ class GenerateUtf8Case extends Maintenance {
 
        public function __construct() {
                parent::__construct();
-               $this->mDescription = 'Generate Utf8Case.ser from the Unicode Character Database ' .
-                       'and supplementary files';
+               $this->addDescription( 'Generate Utf8Case.ser from the Unicode Character Database ' .
+                       'and supplementary files' );
                $this->addOption( 'unicode-data-file', 'The local location of the data file ' .
                        'from http://unicode.org/Public/UNIDATA/UnicodeData.txt', false, true );
        }
@@ -108,12 +108,12 @@ class GenerateUtf8Case extends Maintenance {
                                $data[$name] = $numberedData[$number];
                        }
 
-                       $source = hexSequenceToUtf8( $data['Code'] );
+                       $source = UtfNormal\Utils::hexSequenceToUtf8( $data['Code'] );
                        if ( $data['Simple_Uppercase_Mapping'] ) {
-                               $upper[$source] = hexSequenceToUtf8( $data['Simple_Uppercase_Mapping'] );
+                               $upper[$source] = UtfNormal\Utils::hexSequenceToUtf8( $data['Simple_Uppercase_Mapping'] );
                        }
                        if ( $data['Simple_Lowercase_Mapping'] ) {
-                               $lower[$source] = hexSequenceToUtf8( $data['Simple_Lowercase_Mapping'] );
+                               $lower[$source] = UtfNormal\Utils::hexSequenceToUtf8( $data['Simple_Lowercase_Mapping'] );
                        }
                }