X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FCGI.pm;h=d51b9be0a469c5503f4e3648964c36bb2bb31e27;hb=45f1672bfee50ef8c2ec5938979ee409c5c3db87;hp=3285d52620a686882fc8915f77c02c96ce599019;hpb=c9555cd32e4e6e6f60ca38c0d63374d0f402f75e;p=debbugs.git

diff --git a/Debbugs/CGI.pm b/Debbugs/CGI.pm
index 3285d52..d51b9be 100644
--- a/Debbugs/CGI.pm
+++ b/Debbugs/CGI.pm
@@ -196,7 +196,7 @@ width and height are passed.
 
 sub version_url{
      my %params = validate_with(params => \@_,
-				spec   => {package => {type => SCALAR,
+				spec   => {package => {type => SCALAR|ARRAYREF,
 						      },
 					   found   => {type => ARRAYREF,
 						       default => [],
@@ -400,11 +400,15 @@ sub package_links {
      }
      my @links = ();
      for my $type (qw(src package)) {
-	  push @links, map {(munge_url('pkgreport.cgi?',
+	  push @links, map {my $t_type = $type;
+			    if ($_ =~ s/^src://) {
+				$t_type = 'src';
+			    }
+			    (munge_url('pkgreport.cgi?',
 				       %options,
-				       $type => $_,
+				       $t_type => $_,
 				      ),
-			     $_);
+			     ($t_type eq 'src'?'src:':'').$_);
 		       } make_list($param{$type}) if exists $param{$type};
      }
      for my $type (qw(maint owner submitter correspondent)) {
@@ -536,8 +540,8 @@ the split links with commas and spaces.
 sub maybelink {
     my ($links,$regex,$join) = @_;
     if (not defined $regex and not defined $join) {
-	 $links =~ s{((?:ftp|http|https)://[\S~-]+?/?)([\)\'\:\.\,]?(?:\s|\.<|$))}
-		    {q(<a href=").html_escape($1).q(">).html_escape($1).q(</a>).$2}geimo;
+	 $links =~ s{(.*?)((?:(?:ftp|http|https)://[\S~-]+?/?)?)([\)\'\:\.\,]?(?:\s|\.<|$))}
+		    {html_escape($1).(length $2?q(<a href=").html_escape($2).q(">).html_escape($2).q(</a>):'').html_escape($3)}geimo;
 	 return $links;
     }
     $join = ' ' if not defined $join;