From 38ba63f3c46ea70c475283b1ce080696229f03e8 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Tue, 20 May 2014 14:58:32 -0400
Subject: [PATCH] Bug 12295: fix Javascript error when merging authorities

Attempting to merge authorities results in the following error:
Uncaught SyntaxError: Unexpected token u authorities-home.pl:284
    showMergingInProgress authorities-home.pl:284
    (anonymous function) authorities-home.pl:297
    o jquery.js:2
    p.fireWith jquery.js:2
    e.extend.ready jquery.js:2
    c.addEventListener.B

This was the result of the upgrade of jquery-cookie by the patch
for bug 11369; newer versions of jquery-cookie changed the return of
$.cookie('foo') from null to undefined when the cookie is not present.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No test plan, no errors.

Test
1. search some authorities
2. click merge, on browser dev console pops reported error message
'Unexpected token u authorities-home.pl...'
No way to marge auths
3. with pach applied, merging works again

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1857c444cc6666331eae34e9a99fa1eaa3f1c760)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
index d1964d1d3d..7844f3d09f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
@@ -1,6 +1,6 @@
 function mergeAuth(authid, summary) {
     var alreadySelected = $.cookie('auth_to_merge');
-    if (alreadySelected !== null) {
+    if (alreadySelected !== undefined) {
         alreadySelected = JSON.parse(alreadySelected);
         $.cookie('auth_to_merge', '', { 'path': '/', 'expires': -1 });
         var refstring = "";
@@ -16,7 +16,7 @@ function mergeAuth(authid, summary) {
 
 function showMergingInProgress() {
     var alreadySelected = $.cookie('auth_to_merge');
-    if (alreadySelected !== null) {
+    if (alreadySelected !== undefined) {
         alreadySelected = JSON.parse(alreadySelected);
         $('#merge_in_progress').html(_("Merging with authority: ") + "<a href='detail.pl?authid=" + alreadySelected.authid + "'><span class='authorizedheading'>" + alreadySelected.summary + "</span> (" + alreadySelected.authid + ")</a> <a href='#' id='cancel_merge'>" + _("Cancel merge") + "</a>");
         $('#cancel_merge').click(function(event) {
-- 
2.39.5