From: Don Armstrong <don@volo>
Date: Mon, 20 Nov 2006 12:12:58 +0000 (-0800)
Subject: merge fix for #395027
X-Git-Tag: release/2.6.0~587^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9fea1e7615ba85c9136efa0741c14075e159c08b;p=debbugs.git

merge fix for #395027
---

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 8c7051e3..3a962109 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -609,17 +609,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 .= " ($showversions)" if length $showversions;
     $result .= ";\n";
@@ -750,12 +746,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";
@@ -1040,9 +1036,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 = {};
 
@@ -1092,7 +1089,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 a6731457..df88ac09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -141,6 +141,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Document precisely how forwarded works (closes: #228049)
     - Dissallow forwarded being set to a $gEmailDomain address
       (closes: #397486)
+    - Fix broken sorting by usertags by forcing numeric (closes: #395027)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100