Call encode_utf8 in generate_package_info

[debbugs.git] / Debbugs / CGI / Pkgreport.pm

diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index 696a9e015c382c29555f772b7db61454e32ed5a9..2d0de6f6c74803a704948c31e9fb7ba1961e34ce 100644 (file)
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -41,6 +41,7 @@ use Debbugs::Bugs qw(bug_filter);
 use Debbugs::Packages qw(:mapping);
 
 use Debbugs::Text qw(:templates);
+use Encode qw(encode_utf8);
 
 use POSIX qw(strftime);
 
@@ -167,7 +168,7 @@ sub generate_package_info{
          printf {$output} "<a href=\"%s\">report it</a>.</p>\n",
               html_escape("http://$config{web_domain}/Reporting$config{html_suffix}");
      }
-     return $output_scalar;
+     return encode_utf8($output_scalar);
 }
 
 
@@ -471,20 +472,22 @@ sub parse_order_statement_into_boolean {
     $statement =~ s/\+/&&/g;
     # replace all , with ||
     $statement =~ s/,/||/g;
-    $statement =~ s{(?<field>[^\&\|\=]+)=(?<value>[^\&\|\=]+)}
-              {
+    $statement =~ s{([^\&\|\=]+) # field
+                    =
+                    ([^\&\|\=]+) # value
+              }{
                   my $ok = 0;
-                  if ($+{field} eq 'tag') {
-                      $ok = 1 if defined $tags->{$+{value}};
+                  if ($1 eq 'tag') {
+                      $ok = 1 if defined $tags->{$2};
                   } else {
-                      $ok = 1 if defined $status->{$+{field}} and
-                          $status->{$+{field}} eq $+{value};
+                      $ok = 1 if defined $status->{$1} and
+                          $status->{$1} eq $2;
                   }
                   $ok;
               }exg;
     # check that the parsed statement is just valid boolean statements
     if ($statement =~ /^([01\(\)\&\|]+)$/) {
-        return eval "$statement";
+        return eval "$1";
     } else {
         # this is an invalid boolean statement
         return 0;