Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* (bug 2835) Back out fix for bug 2802, caused regressions in category sort

Browse source
This commit is contained in:
Brion Vibber 2005-07-14 05:45:51 +00:00
parent f3a439d858
commit 94a2b41470
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES
View file

@ -565,7 +565,6 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
* (bug 2780) Fix thumbnail generation with GD for new image schema
* (bug 2791) Slovene numeric format
* (bug 655) Provide empty search form when searching for nothing
* (bug 2802) Display more than one character of the sort key
* Nynorsk numeric format fix
* (bug 2825) Fix regression in newtalk notifications for anons w/ enotif off
* (bug 2833) Fix bug in previous fix
@ -581,6 +580,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
* (bug 460) Properly handle <center> tags as a block.
* (bug 2001) Implement client-side sorting of table fields with JavaScript
* Undo inconsistent editing behavior change
* (bug 2835) Back out fix for bug 2802, caused regressions in category sort
=== Caveats ===

18
includes/CategoryPage.php
View file

@ -140,25 +140,9 @@ class CategoryPage extends Article {
} else {
// Page in this category
array_push( $articles, $sk->makeSizeLinkObj( $x->page_len, $title, $wgContLang->convert( $title->getPrefixedText() ) ) ) ;
array_push( $articles_start_char,$wgContLang->convert( $x->cl_sortkey) );
array_push( $articles_start_char, $wgContLang->convert( $wgContLang->firstChar( $x->cl_sortkey ) ) );
}
}
$root_length = 0;
for ($i = 0 ; $i < count($articles) - 1; ++$i){
if ($articles_start_char[$i][$root_length] != $articles_start_char[$i + 1][$root_length] ) {
break;
} elseif (count($articles) - 2 == $i) {
$root_length = $root_length + 1;
$i = -1;
}
}
for ($i = 0 ; $i < count($articles) ; ++$i) {
$articles_start_char[$i] = $wgContLang->truncate($articles_start_char[$i], $root_length + 1);
}
$dbr->freeResult( $res );
if( $flip ) {