From d74561fcec404d3840fb9c1606a8f319833f4855 Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Thu, 23 May 2013 16:32:49 -0400 Subject: [PATCH] LP1081576 - fix utf8 characters in searches using portal page Replace escape() with encodeURIComponent() on the portal page to allow utf8 characters to be passed more appropriately to the subsequent search in catalog. Thanks Dan Scott for pointing this out. Signed-off-by: Ben Shum Signed-off-by: Pasi Kallinen Conflicts: Open-ILS/xul/staff_client/server/index.xhtml --- Open-ILS/xul/staff_client/server/index.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml index 15d77c2e1f..5fe7ef0e47 100644 --- a/Open-ILS/xul/staff_client/server/index.xhtml +++ b/Open-ILS/xul/staff_client/server/index.xhtml @@ -41,9 +41,9 @@ var search_depth = 0; // 0 = consortium, 1 = system, 2 = library, 3 = sub-library, etc. if(textbox && textbox.value != "") { - var opac_url = xulG.url_prefix(urls.opac_rresult) + "?rt=keyword&tp=keyword&l=" + home_ou_id + "&d=" + search_depth +"&f=&t=" + escape(textbox.value); + var opac_url = xulG.url_prefix(urls.opac_rresult) + "?rt=keyword&tp=keyword&l=" + home_ou_id + "&d=" + search_depth +"&f=&t=" + encodeURIComponent(textbox.value); if (urls.opac_rresult.match(/\/eg\/opac\/results/)) { - opac_url = xulG.url_prefix(urls.opac_rresult) + "?query=" + escape(textbox.value); + opac_url = xulG.url_prefix(urls.opac_rresult) + "?query=" + encodeURIComponent(textbox.value); } var params = {'tab_name':'Catalog'}; var content_params = { 'session' : ses(), 'authtime' : ses('authtime'), 'opac_url' : opac_url }; -- 2.11.0