From: Paul Poulain <paul.poulain@biblibre.com>
Date: Thu, 8 Dec 2011 09:08:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into new/bug_6679
X-Git-Tag: v3.08.00~800
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=b9d743a9281bfd6c853ffaa639577e1801f3b71b;hp=c0234dd9b9649063acf2617fecf5c6efda38a532;p=srvgit

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 a54894b3e2..32ea2f6f3f 100755
--- 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 19e53fb2d7..c97828b24b 100755
--- 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';