remove UTF8 warnings

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

diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index d14997930ab82facf0ef84dbd711a51d21abd5ee..3e9cb3f86ebccf08404dd2e2a370e686f5c7cccc 100644 (file)
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -28,7 +28,7 @@ None known.
 use warnings;
 use strict;
 use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
-use base qw(Exporter);
+use Exporter qw(import);
 
 use IO::Scalar;
 use Params::Validate qw(validate_with :types);
@@ -41,6 +41,7 @@ use Debbugs::Bugs qw(bug_filter);
 use Debbugs::Packages qw(:mapping);
 
 use Debbugs::Text qw(:templates);
+use Encode qw(decode_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 decode_utf8($output_scalar);
 }
 
 
@@ -486,7 +487,7 @@ sub parse_order_statement_into_boolean {
               }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;