Merge remote branch 'origin/new/bug6554_reverts'

diff --combined reports/guided_reports.pl
index c1c5590,af18909..46a65f1
--- 1/reports/guided_reports.pl
--- 2/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@@ -736,7 -736,7 +736,7 @@@ elsif ($phase eq 'Run this report')
              my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);
              my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report_id&phase=Run%20this%20report&limit=$limit";
              if (@sql_params) {
-                 $url = join('&sql_params=', $url, map { URI::Escape::uri_escape_utf8($_) } @sql_params);
+                 $url = join('&sql_params=', $url, map { URI::Escape::uri_escape($_) } @sql_params);
              }
              $template->param(
                  'results' => \@rows,
@@@ -748,7 -748,6 +748,7 @@@
                  'errors'  => $errors,
                  'pagination_bar'  => pagination_bar($url, $totpages, $input->param('page')),
                  'unlimited_total' => $total,
 +                'sql_params'      => \@sql_params,
              );
          }
      }

diff --combined tags/review.pl
index 3f4cc50,3b7a0a0..1affd53
--- 1/tags/review.pl
--- 2/tags/review.pl
+++ b/tags/review.pl
@@@ -23,7 -23,7 +23,7 @@@ use warnings
  use strict;
  use Data::Dumper;
  use POSIX;
- use CGI qw/-utf8/;
+ use CGI;
  use CGI::Cookie; # need to check cookies before having CGI parse the POST request
  
  use C4::Auth qw(:DEFAULT check_cookie_auth);
@@@ -89,12 -89,7 +89,12 @@@ my ($template, $borrowernumber, $cookie
  });
  
  my ($op, @errors, @tags);
 -$op   = lc($input->param('op')) || 'none';
 +
 +foreach (qw( approve reject test )) {
 +    $op = $_ if ( $input->param("op-$_") );
 +}
 +$op ||= 'none';
 +
  @tags = $input->param('tags');
  
  $borrowernumber == 0 and push @errors, {op_zero=>1};