Attachment 117037 Details for Bug 22824 – Bug 22824: Fix encoding of misc/admin/koha-preferences output

[patch] Bug 22824: Fix encoding of misc/admin/koha-preferences output

Bug-22824-Fix-encoding-of-miscadminkoha-preference.patch (text/plain), 1.09 KB, created by Julian Maurice on 2021-02-19 09:49:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2021-02-19 09:49:50 UTC

Size: 1.09 KB

patch

obsolete

>From 0eed9d5545094ca9248d4b75a77bfb5db23cff61 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Fri, 19 Feb 2021 10:48:42 +0100
>Subject: [PATCH] Bug 22824: Fix encoding of misc/admin/koha-preferences output
>
>---
> misc/admin/koha-preferences | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
>diff --git a/misc/admin/koha-preferences b/misc/admin/koha-preferences
>index af2cce2b7c..a2062ba57f 100755
>--- a/misc/admin/koha-preferences
>+++ b/misc/admin/koha-preferences
>@@ -26,7 +26,6 @@ use C4::Log;
> use Getopt::Long;
> use Pod::Usage;
> use YAML::XS;
>-use Encode;
> our %NOT_SET_PREFS = map { $_, 1 } qw( Version );
> 
> =head1 NAME
>@@ -214,11 +213,7 @@ my %commands = (
>             'o:s' => \$outfile
>         ) || _print_usage( 1 );
> 
>-        if ( $outfile ) {
>-            YAML::XS::DumpFile( $outfile, GetPreferences() );
>-        } else {
>-            print Encode::decode_utf8(YAML::XS::Dump(GetPreferences()));
>-        }
>+        YAML::XS::DumpFile( $outfile || \*STDOUT, GetPreferences() );
>     },
>     load => sub {
>         my ( $infile, $force_version );
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22824: 116722 | 116723 | 116724 | 116725 | 116726 | 116727 | 116728 | 116729 | 116730 | 116731 | 116732 | 116733 | 116734 | 116735 | 116736 | 116741 | 116742 | 116743 | 116744 | 116745 | 116746 | 116747 | 116748 | 116749 | 116750 | 116751 | 116752 | 116753 | 116754 | 116755 | 116756 | 116881 | 116882 | 116883 | 116884 | 117037 | 117039 | 117040 | 117041 | 117042 | 117043 | 117044 | 117045 | 117046 | 117047 | 117048 | 117049 | 117050 | 117051 | 117052 | 117053 | 117054 | 117055 | 117056 | 117057 | 117058 | 117636 | 117637 | 117638 | 117639 | 117640 | 117641 | 117642 | 117643 | 117644 | 117645 | 117646 | 117647 | 117648 | 117649 | 117650 | 117651 | 117652 | 117653 | 117664 | 117666