From e809eff05f6415e344f3e08c2cd0925109333c15 Mon Sep 17 00:00:00 2001
From: Paul POULAIN <paul@koha-fr.org>
Date: Tue, 18 Sep 2007 18:38:30 +0200
Subject: [PATCH] BUGFIX : branch CPL was hardcoded

What is the branch CPL ?

Anyway, this was buggy and reseted the branch to empty
which was a bug ;-)

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 circ/circulation.pl                                  | 12 ++++++------
 .../intranet-tmpl/prog/en/includes/cat-search.inc    |  2 +-
 .../prog/en/includes/cataloging-search.inc           |  2 +-
 .../intranet-tmpl/prog/en/includes/circ-search.inc   |  2 +-
 .../prog/en/includes/cities-admin-menu.inc           |  2 +-
 .../prog/en/includes/currencies-admin-search.inc     |  2 +-
 .../prog/en/includes/members-search.inc              |  2 +-
 .../prog/en/includes/roadtype-admin-menu.inc         |  2 +-
 .../prog/en/includes/serials-search.inc              |  2 +-
 .../prog/en/includes/z3950-admin-search.inc          |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 15c041c8a2..8009da9ee3 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -57,12 +57,12 @@ my $query = new CGI;
 my $branch = $query->param('branch');
 if ($branch){
     # update our session so the userenv is updated
-	my $dbh=C4::Context->dbh;
-	my $sessionID = $query->cookie("CGISESSID") ;
-	my $session = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh});
-	$session->param('branch',$branch);
-	my $branchname = GetBranchName($branch);
-	$session->param('branchname',$branchname);
+    my $dbh=C4::Context->dbh;
+    my $sessionID = $query->cookie("CGISESSID") ;
+    my $session = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh});
+    $session->param('branch',$branch);
+    my $branchname = GetBranchName($branch);
+    $session->param('branchname',$branchname);
 }
 
 my $printer = $query->param('printer');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 936a3b7c1b..e04c650e93 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -5,7 +5,7 @@
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
 			<label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
 	<input value="Submit" type="submit" />
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index 9fee1fdb99..40e65278a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -12,7 +12,7 @@
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
 			<label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
 	<input value="Submit" type="submit" />
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 5dadbd021b..76629a5d75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -5,7 +5,7 @@
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
 			<label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
 	<input value="Submit" type="submit" />
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc
index a0408c629c..7e85bc9096 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc
@@ -12,7 +12,7 @@
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
 			<label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
 	<input value="Submit" type="submit" />
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index 42c1b1242d..7e4622bea6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -12,7 +12,7 @@
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
 			<label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
 	<input value="Submit" type="submit" />
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
index 09011f1c70..f8cfb97c36 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
@@ -17,7 +17,7 @@
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
 			<label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
 	<input value="Submit" type="submit" />
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc
index 3bea57f6c4..a21e24d3a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc
@@ -12,7 +12,7 @@
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
 			<label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
 	<input value="Submit" type="submit" />
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index 12451a8117..41202ab82c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -9,7 +9,7 @@
 	<p class="tip">Enter patron card number or partial name:</p>
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
 	<input value="Submit" type="submit" />
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index b66e148554..2102c535c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -12,7 +12,7 @@
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
 			<label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
 	<input value="Submit" type="submit" />
 	</form>
-- 
2.39.5