Attachment 21318 Details for Bug 6554 – An update to Templates.pm

[patch] An update to Templates.pm

0001-double-decoding-problem-bug-6554.patch (text/plain), 1.30 KB, created by Ketan Kulkarni on 2013-09-22 18:27:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ketan Kulkarni

Created: 2013-09-22 18:27:37 UTC

Size: 1.30 KB

patch

obsolete

>From 5fb9da1ca23cd6e6335e64dbc5adfb016759b011 Mon Sep 17 00:00:00 2001
>From: Ketan Kulkarni <ketan@carvingit.com>
>Date: Sun, 22 Sep 2013 23:42:28 +0530
>Subject: [PATCH] double decoding problem - bug # 6554
>
>---
> C4/Templates.pm |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Templates.pm b/C4/Templates.pm
>index 21604fc..ff887c0 100644
>--- a/C4/Templates.pm
>+++ b/C4/Templates.pm
>@@ -124,7 +124,7 @@ sub output {
>             utf8_hashref($vars->{$k});
>         }
>         else {
>-            utf8::encode($vars->{$k}) if utf8::is_utf8($vars->{$k});
>+            utf8::encode($vars->{$k}) if(utf8::decode($vars->{$k}) || utf8::is_utf8($vars->{$k}));
>         }
>     }
>     my $data;
>@@ -145,7 +145,7 @@ sub utf8_arrayref {
>             utf8_hashref($element);
>             next;
>         }
>-        utf8::encode($element) if utf8::is_utf8($element);
>+        utf8::encode($element) if(utf8::decode($element) || utf8::is_utf8($element));
>     }        
> }         
> 
>@@ -160,7 +160,7 @@ sub utf8_hashref {
>             utf8_hashref($hashref->{$key});
>             next;
>         }
>-        utf8::encode($hashref->{$key}) if utf8::is_utf8($hashref->{$key});
>+        utf8::encode($hashref->{$key}) if(utf8::decode($hashref->{$key}) || utf8::is_utf8($hashref->{$key}));
>     }
> }
>         
>-- 
>1.7.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 6554: 4558 | 4560 | 4561 | 4562 | 4563 | 4564 | 5962 | 6041 | 6065 | 6070 | 6071 | 6072 | 6073 | 6076 | 6077 | 6078 | 6079 | 6080 | 6083 | 6084 | 6085 | 6108 | 10118 | 16780 | 16797 | 16857 | 16905 | 16929 | 16930 | 16931 | 16932 | 16960 | 16961 | 16962 | 16963 | 16964 | 16966 | 16968 | 16969 | 16984 | 16985 | 16986 | 16987 | 16988 | 16989 | 17179 | 17186 | 17187 | 17327 | 17328 | 18746 | 18747 | 18749 | 18750 | 21318 | 21399 | 21478 | 21488 | 21506 | 21509 | 21581 | 21629 | 21631 | 21632 | 21682 | 21937 | 21955 | 21978 | 21980 | 21981 | 23107 | 23140