[project @ 2003-01-29 10:48:02 by cjwatson]

Take <strong> back out of the Package: line in bugreport.cgi output, as its
presence breaks yaclc.

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index b2c82cf3d202539cffba19b69f5fdb56e222934e..1c6f1d4b9f931f26de3162e9c7017fb89ab7e092 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -92,7 +92,7 @@ if  ($status{severity} eq 'normal') {
 }
 
 $indexentry .= "<p>$showseverity";
-$indexentry .= htmlpackagelinks($status{package});
+$indexentry .= htmlpackagelinks($status{package}, 0);
 
 $indexentry .= "Reported by: <a href=\"" . submitterurl($status{originator})
               . "\">" . htmlsanit($status{originator}) . "</a>;\n";

diff --git a/cgi/common.pl b/cgi/common.pl
index 72f41886a3217ebc10efd8dd32e028bcdd6249e3..95d37936be60ee3ac6ecd948379ef990d5b9ee86 100644 (file)
--- a/cgi/common.pl
+++ b/cgi/common.pl
@@ -119,13 +119,17 @@ sub splitpackages {
 sub htmlpackagelinks {
     my $pkgs = shift;
     return unless defined $pkgs and $pkgs ne '';
+    my $strong = shift;
     my @pkglist = splitpackages($pkgs);
 
+    my $openstrong  = $strong ? '<strong>' : '';
+    my $closestrong = $strong ? '</strong>' : '';
+
     return 'Package' . (@pkglist > 1 ? 's' : '') . ': ' .
            join(', ',
                 map {
                     '<a href="' . pkgurl($_) . '">' .
-                    '<strong>' . htmlsanit($_) . '</strong></a>'
+                    $openstrong . htmlsanit($_) . $closestrong . '</a>'
                 } @pkglist
            ) . ";\n";
 }
@@ -151,7 +155,7 @@ sub htmlindexentrystatus {
         $showseverity = "Severity: <em>$status{severity}</em>;\n";
     }
 
-    $result .= htmlpackagelinks($status{"package"});
+    $result .= htmlpackagelinks($status{"package"}, 1);
     $result .= $showseverity;
     $result .= "Reported by: <a href=\"" . submitterurl($status{originator})
                . "\">" . htmlsanit($status{originator}) . "</a>";