From 88f68475063dac4f7f7d894a58c6e3f96dcf264c Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@volo>
Date: Mon, 20 Nov 2006 04:09:09 -0800
Subject: [PATCH]  * Fix various silly statements in cgi/pkgreport.cgi  * Fix
 ordering with usertags

---
 cgi/pkgreport.cgi | 17 +++++++----------
 debian/changelog  |  1 +
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 1bf969f..30284ba 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -604,17 +604,13 @@ sub pkg_htmlindexentrystatus {
     my $showversions = '';
     if (@{$status{found_versions}}) {
         my @found = @{$status{found_versions}};
-        local $_;
-        s{/}{ } foreach @found;
-        $showversions .= join ', ', map htmlsanit($_), @found;
+        $showversions .= join ', ', map {s{/}{ }; htmlsanit($_)} @found;
     }
     if (@{$status{fixed_versions}}) {
         $showversions .= '; ' if length $showversions;
         $showversions .= '<strong>fixed</strong>: ';
         my @fixed = @{$status{fixed_versions}};
-        local $_;
-        s{/}{ } foreach @fixed;
-        $showversions .= join ', ', map htmlsanit($_), @fixed;
+        $showversions .= join ', ', map {s{/}{ }; htmlsanit($_)} @fixed;
     }
     $result .= ' (<a href="'.
 	 version_url($status{package},
@@ -748,12 +744,12 @@ sub pkg_htmlizebugs {
 	    push @keys_in_order, "X";
 	    while ((my $k = shift @keys_in_order) ne "X") {
 	        for my $k2 (@{$o}) {
+		    $k2+=0;
 		    push @keys_in_order, "${k}_${k2}";
 		}
 	    }
 	}
-        for ( my $i = 0; $i <= $#keys_in_order; $i++ ) {
-            my $order = $keys_in_order[ $i ];
+        for my $order (@keys_in_order) {
             next unless defined $section{$order};
 	    my @ttl = split /_/, $order; shift @ttl;
 	    my $title = $title[0]->[$ttl[0]] . " bugs";
@@ -1019,9 +1015,10 @@ sub determine_ordering {
     $cats{severity}[0]{ord} = [ reverse @{$cats{severity}[0]{ord}} ]
         if ($sev_rev);
 
+    my $i;
     if (defined $param{"pri0"}) {
         my @c = ();
-        my $i = 0;
+        $i = 0;
         while (defined $param{"pri$i"}) {
             my $h = {};
 
@@ -1071,7 +1068,7 @@ sub determine_ordering {
         return $expr;
     }
  
-    my $i = 0;
+    $i = 0;
     for my $c (@cats) {
         $i++;
         push @prior, $c->{"pri"};
diff --git a/debian/changelog b/debian/changelog
index 2445d00..b7536a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -138,6 +138,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Fix javascript error in pkgreport.cgi (closes: #346043)
     - When a bug can't be found in control@; indicate to user that it may
       be archived. (closes: #153536)
+    - Fix broken sorting by usertags by forcing numeric (closes: #395027)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
-- 
2.39.2