Attachment 35241 Details for Bug 11944 – Bug 11944: Fix encoding issue on search history

[patch] Bug 11944: Fix encoding issue on search history

Bug-11944-Fix-encoding-issue-on-search-history.patch (text/plain), 1.73 KB, created by Jonathan Druart on 2015-01-14 15:44:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-01-14 15:44:18 UTC

Size: 1.73 KB

patch

obsolete

>From 447ca250dd93ee06242c4f3a3b1bfc5432b932b9 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Thu, 8 May 2014 12:34:24 +0200
>Subject: [PATCH] Bug 11944: Fix encoding issue on search history
>
>Newly introduced by patches from bug 10807, the string was decoded
>before to be stored in session.
>
>To reproduce:
>Enable history search
>Go at the OPAC and log out
>Search for something with utf-8
>Go on your search history
>The search description should be correctly encoded
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
>---
> C4/Search/History.pm | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Search/History.pm b/C4/Search/History.pm
>index 4330692..9640476 100644
>--- a/C4/Search/History.pm
>+++ b/C4/Search/History.pm
>@@ -37,8 +37,8 @@ sub add {
> sub add_to_session {
>     my ($params) = @_;
>     my $cgi = $params->{cgi};
>-    my $query_desc = Encode::decode_utf8( $params->{query_desc} ) || "unknown";
>-    my $query_cgi  = Encode::decode_utf8( $params->{query_cgi} )  || "unknown";
>+    my $query_desc = $params->{query_desc} || "unknown";
>+    my $query_cgi  = $params->{query_cgi} || "unknown";
>     my $total      = $params->{total};
>     my $type       = $params->{type}                              || 'biblio';
> 
>@@ -152,7 +152,7 @@ sub set_to_session {
>     my $session = C4::Auth::get_session($sessionID);
>     return () unless $session;
>     $session->param( 'search_history',
>-        uri_escape_utf8( encode_json($search_history) ) );
>+        uri_escape( encode_json($search_history) ) );
> }
> 
> 1;
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 11944: 26364 | 26365 | 26366 | 26367 | 26368 | 26369 | 26370 | 26371 | 26372 | 26407 | 26408 | 26409 | 26737 | 26738 | 26739 | 26740 | 26741 | 26742 | 26743 | 26744 | 26745 | 26746 | 26747 | 26748 | 26794 | 26857 | 26858 | 26859 | 26860 | 26861 | 26862 | 26863 | 26864 | 26865 | 26866 | 26867 | 26868 | 26869 | 26870 | 26871 | 26895 | 26921 | 27021 | 27080 | 27094 | 27158 | 27159 | 27161 | 27193 | 27194 | 27195 | 27196 | 27198 | 27199 | 27200 | 27201 | 27202 | 27203 | 27204 | 27205 | 27206 | 27207 | 27208 | 27209 | 27210 | 27211 | 27212 | 27213 | 27214 | 27215 | 27216 | 27585 | 27586 | 27587 | 27588 | 27589 | 27590 | 27591 | 27592 | 27593 | 27594 | 27595 | 27596 | 27597 | 27598 | 27599 | 27600 | 27601 | 27602 | 27603 | 27880 | 27881 | 27882 | 27883 | 27884 | 27885 | 27886 | 27887 | 27888 | 27889 | 27890 | 27891 | 27892 | 27893 | 27894 | 27895 | 27896 | 27897 | 27898 | 28046 | 28047 | 28048 | 28049 | 28050 | 28051 | 28052 | 28053 | 28054 | 28055 | 28056 | 28057 | 28058 | 28059 | 28060 | 28061 | 28062 | 28063 | 28064 | 28065 | 28066 | 28097 | 28245 | 28246 | 28247 | 28248 | 28249 | 28250 | 28251 | 28252 | 28253 | 28732 | 29981 | 29982 | 29983 | 29984 | 29985 | 29986 | 29987 | 29988 | 29989 | 29990 | 29991 | 29992 | 29993 | 29994 | 29995 | 29996 | 29997 | 29998 | 29999 | 30000 | 30001 | 30002 | 30003 | 30004 | 30005 | 30006 | 30012 | 30016 | 30945 | 31299 | 35223 | 35224 | 35225 | 35226 | 35227 | 35228 | 35229 | 35230 | 35231 | 35232 | 35233 | 35234 | 35235 | 35236 | 35237 | 35238 | 35239 | 35240 | 35241 | 35242 | 35243 | 35244 | 35245 | 35246 | 35247 | 35248 | 35249 | 35250 | 35251 | 35252 | 35253