Merge remote-tracking branch 'origin/master' into new/bug_6679

Conflicts:
	catalogue/showmarc.pl

diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl
index a54894b..32ea2f6 100755 (executable)
--- a/catalogue/showmarc.pl
+++ b/catalogue/showmarc.pl
@@ -23,7 +23,7 @@
 use strict;
 #use warnings; FIXME - Bug 2505
 
-use open OUT=>':utf8', ':std';
+use open OUT=>":encoding(UTF-8)", ':std';
 
 # standard or CPAN modules used
 use CGI qw(:standard);

diff --git a/t/00-testcritic.t b/t/00-testcritic.t
index 19e53fb..c97828b 100755 (executable)
--- a/t/00-testcritic.t
+++ b/t/00-testcritic.t
@@ -16,8 +16,8 @@ my @all_koha_dirs = qw( acqui admin authorities basket C4 catalogue cataloguing
 labels members misc offline_circ opac patroncards reports reserve reviews rotating_collections
 serials sms suggestion t tags test tools virtualshelves);
 
-my @dirs = qw( acqui admin authorities basket circ debian errors offline_circ reserve reviews rotating_collections
-serials sms virtualshelves );
+my @dirs = qw( acqui admin authorities basket catalogue circ debian errors offline_circ reserve 
+    reviews rotating_collections serials sms virtualshelves );
 
 if ( not $ENV{TEST_QA} ) {
     my $msg = 'Author test. Set $ENV{TEST_QA} to a true value to run';