--- Build.pm 26 Jul 2006 01:20:04 -0000 1.129
+++ Build.pm 1 Aug 2006 01:11:10 -0000
@@ -731,12 +731,30 @@
if (@subcat_ids or keys %related_ids) {
$cat_db->select_options("ORDER BY $opts->{cat_sb} $opts->{cat_so}") if $opts->{cat_sb};
my $sth = $cat_db->select({ ID => [@subcat_ids, keys %related_ids] });
+ my @rel_loop;
while (my $cat = $sth->fetchrow_hashref) {
+ $cat->{URL} = "$CFG->{build_root_url}/" . $cat_db->as_url($cat->{Full_Name}) . "/" . ($CFG->{build_index_include} ? $CFG->{build_index} : '');
if (exists $related_ids{$cat->{ID}}) {
$cat->{Related} = 1;
$cat->{RelationName} = $related_ids{$cat->{ID}};
+# Relations with a custom name need to be re-sorted
+ if ($cat->{RelationName}) {
+ push @rel_loop, $cat;
+ next;
+ }
+ }
+ push @cat_loop, $cat;
+ }
+# Re-sort related categories using their RelationName rather than the related
+# category's name
+ RELATION: while (my $cat = pop @rel_loop) {
+ for (my $i = 0; $i < @cat_loop; $i++) {
+ my $name = (exists $cat_loop[$i]->{RelationName} and $cat_loop[$i]->{RelationName}) ? $cat_loop[$i]->{RelationName} : $cat_loop[$i]->{Name};
+ if (lc $cat->{RelationName} lt lc $name) {
+ splice @cat_loop, $i, 0, $cat;
+ next RELATION;
+ }
}
- $cat->{URL} = "$CFG->{build_root_url}/" . $cat_db->as_url($cat->{Full_Name}) . "/" . ($CFG->{build_index_include} ? $CFG->{build_index} : '');
push @cat_loop, $cat;
}
my $print_cat;