diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2011-12-03 13:29:22 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2011-12-03 13:29:22 +0100 |
commit | ca32f08966f1b51fcb19460f0996bb0c4048e6fe (patch) | |
tree | ec04cc15b867bc21eedca904cea9af0254531a11 /maintenance/language/generateCollationData.php | |
parent | a22fbfc60f36f5f7ee10d5ae6fe347340c2ee67c (diff) |
Update to MediaWiki 1.18.0
* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
Diffstat (limited to 'maintenance/language/generateCollationData.php')
-rw-r--r-- | maintenance/language/generateCollationData.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/maintenance/language/generateCollationData.php b/maintenance/language/generateCollationData.php index 68ad2ddf..2c3ffedc 100644 --- a/maintenance/language/generateCollationData.php +++ b/maintenance/language/generateCollationData.php @@ -68,9 +68,12 @@ class GenerateCollationData extends Maintenance { } function charCallback( $data ) { - // Skip non-printable characters + // Skip non-printable characters, + // but do not skip a normal space (U+0020) since + // people like to use that as a fake no header symbol. $category = substr( $data['gc'], 0, 1 ); - if ( strpos( 'LNPS', $category ) === false ) { + if ( strpos( 'LNPS', $category ) === false + && $data['cp'] !== '0020' ) { return; } $cp = hexdec( $data['cp'] ); @@ -193,7 +196,7 @@ class GenerateCollationData extends Maintenance { // portion equal to the first character, then remove the second // character. This avoids having characters like U+A732 (double A) // polluting the basic latin sort area. - $prevWeights = array(); + foreach ( $this->groups as $weight => $group ) { if ( preg_match( '/(\.[0-9A-F]*)\./', $weight, $m ) ) { if ( isset( $this->groups[$m[1]] ) ) { @@ -377,5 +380,5 @@ class UcdXmlReader { } $maintClass = 'GenerateCollationData'; -require_once( DO_MAINTENANCE ); +require_once( RUN_MAINTENANCE_IF_MAIN ); |