merge more changes from dla source

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index fde5a8b707f89f8efaf67c1d199c354c7d7c1228..4c73dbbc4905a23a4910b82ce97f1d61d7a71d34 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -445,7 +445,7 @@ sub handle_record{
               $output .= ' ('.strftime('%a, %d %b %Y %T GMT',gmtime($time)).') ';
          }
          $output .= '<a href="' . html_escape(bug_url($ref, msg => ($msg_number+1))) . '">Full text</a> and <a href="' .
-              html_escape(bug_url($ref, msg => ($msg_number+1)), mbox => 'yes') . '">rfc822 format</a> available.';
+              html_escape(bug_url($ref, msg => ($msg_number+1), mbox => 'yes')) . '">rfc822 format</a> available.';
 
          $output = qq(<div class="$class"><hr>\n<a name="$msg_number"></a>\n) . $output . "</div>\n";
      }

diff --git a/scripts/service.in b/scripts/service.in
index 53058a6fddb9a24b612fb243c2bee808d314cae7..943c883d4c0742a018995a24d34efce2306fb2cd 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -810,7 +810,7 @@ END
                $data->{keywords} =~ s/\s*$//;
             } while (&getnextbug);
        }
-    } elsif (m/^(un)?block\s+\#?(-?\d+)\s+(by|with)\s+\s*(\S.*)?$/i) {
+    } elsif (m/^(un)?block\s+\#?(-?\d+)\s+(by|with)\s+(\S.*)?$/i) {
        $ok++;
        my $bugnum = $2; my $blockers = $4;
        $addsub = "add";