| Index: trunk/phase3/maintenance/updateCollation.php |
| — | — | @@ -60,7 +60,8 @@ |
| 61 | 61 | if ( $row->cl_collation == 0 ) { |
| 62 | 62 | # This is an old-style row, so the sortkey needs to be |
| 63 | 63 | # converted. |
| 64 | | - if ( $row->cl_sortkey == $title->getCategorySortkey() ) { |
| | 64 | + if ( $row->cl_sortkey == $title->getText() |
| | 65 | + || $row->cl_sortkey == $title->getPrefixedText() ) { |
| 65 | 66 | $prefix = ''; |
| 66 | 67 | } else { |
| 67 | 68 | # Custom sortkey, use it as a prefix |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -4149,13 +4149,7 @@ |
| 4150 | 4150 | * @return string |
| 4151 | 4151 | */ |
| 4152 | 4152 | public function getCategorySortkey( $prefix = '' ) { |
| 4153 | | - global $wgCategoryPrefixedDefaultSortkey; |
| 4154 | | - if ( $this->getNamespace() == NS_CATEGORY |
| 4155 | | - || !$wgCategoryPrefixedDefaultSortkey ) { |
| 4156 | | - $unprefixed = $this->getText(); |
| 4157 | | - } else { |
| 4158 | | - $unprefixed = $this->getPrefixedText(); |
| 4159 | | - } |
| | 4153 | + $unprefixed = $this->getText(); |
| 4160 | 4154 | if ( $prefix !== '' ) { |
| 4161 | 4155 | # Separate with a null byte, so the unprefixed part is only used as |
| 4162 | 4156 | # a tiebreaker when two pages have the exact same prefix -- null |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -4467,12 +4467,6 @@ |
| 4468 | 4468 | $wgCategoryPagingLimit = 200; |
| 4469 | 4469 | |
| 4470 | 4470 | /** |
| 4471 | | - * Should the default category sortkey be the prefixed title? |
| 4472 | | - * Run maintenance/refreshLinks.php after changing this. |
| 4473 | | - */ |
| 4474 | | -$wgCategoryPrefixedDefaultSortkey = true; |
| 4475 | | - |
| 4476 | | -/** |
| 4477 | 4471 | * A version indicator for collations that will be stored in cl_collation for |
| 4478 | 4472 | * all new rows. Used when the collation algorithm changes: a script checks |
| 4479 | 4473 | * for all rows where cl_collation != $wgCollationVersion and regenerates |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -48,6 +48,8 @@ |
| 49 | 49 | normal $wgDBport. |
| 50 | 50 | * The upload link for missing files can now be set separately from the |
| 51 | 51 | navigation link with $wgUploadMissingFileUrl. |
| | 52 | +* $wgCategoryPrefixedDefaultSortkey was removed and is now always false. This |
| | 53 | + provides more sensible sorting behavior for categories. |
| 52 | 54 | |
| 53 | 55 | === New features in 1.17 === |
| 54 | 56 | * (bug 10183) Users can now add personal styles and scripts to all skins via |