Attachment 39958 Details for Bug 11790 – [PASSED QA] Bug 11790: Remove dependency C4::Context from C4::Charset

[patch] [PASSED QA] Bug 11790: Remove dependency C4::Context from C4::Charset

PASSED-QA-Bug-11790-Remove-dependency-C4Context-fr.patch (text/plain), 1.40 KB, created by Katrin Fischer on 2015-06-07 14:58:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2015-06-07 14:58:26 UTC

Size: 1.40 KB

patch

obsolete

>From 748a6efcdfefc9405cf312bd52a2c53ce0b65d9e Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Fri, 24 Apr 2015 17:03:09 +0200
>Subject: [PATCH] [PASSED QA] Bug 11790: Remove dependency C4::Context from
> C4::Charset
>
>C4::Context is only used to retrieve a syspref value.
>This patch moves the use of C4::Context to a require.
>
>Test plan:
>Try to reach the SetMarcUnicodeFlag subroutine (batchmod, add/update a biblio, etc.)
>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Tested on French UNIMARC install
>No errors adding/editing biblios
>No koha-qa errors
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> C4/Charset.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/C4/Charset.pm b/C4/Charset.pm
>index 41a8d83..667c2d2 100644
>--- a/C4/Charset.pm
>+++ b/C4/Charset.pm
>@@ -22,7 +22,6 @@ use warnings;
> 
> use MARC::Charset qw/marc8_to_utf8/;
> use Text::Iconv;
>-use C4::Context;
> use C4::Debug;
> use Unicode::Normalize;
> use Encode qw( decode encode is_utf8 );
>@@ -333,6 +332,7 @@ sub SetMarcUnicodeFlag {
>         substr($leader, 9, 1) = 'a';
>         $marc_record->leader($leader); 
>     } elsif ($marc_flavour =~/UNIMARC/) {
>+        require C4::Context;
> 	my $defaultlanguage = C4::Context->preference("UNIMARCField100Language");
>         $defaultlanguage = "fre" if (!$defaultlanguage || length($defaultlanguage) != 3);
>         my $string; 
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 11790: 38494 | 39239 | 39958