this patch fix some leaks when applying/pushing the previous patch in the
branch.
---
circ/circulation.pl | 14 +++++++-------
.../prog/en/modules/circ/circulation.tmpl | 1 +
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 2074e82..e1aedb4 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -275,14 +275,14 @@ if ($barcode) {
if ($impossible eq "NOT_FOR_LOAN_CAN_FORCE"){
$$question{$impossible}=$$error{$impossible},
} else {
- $template->param(
- $impossible => $$error{$impossible},
- IMPOSSIBLE => 1
- );
+ $template->param(
+ $impossible => $$error{$impossible},
+ IMPOSSIBLE => 1
+ );
+ $noerror = 0;
}
- $noerror = 0;
+
}
-
if ($issueconfirmed && $noerror) {
# we have no blockers for issuing and any issues needing confirmation have
been resolved
AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
@@ -300,7 +300,7 @@ if ($barcode) {
# Get the item title for more information
my $getmessageiteminfo = GetBiblioFromItemNumber(undef,$barcode);
if ($noerror) {
- # only pass needsconfirmation to template if issuing is
possible
+ # only pass needsconfirmation to template if issuing is
possible
foreach my $needsconfirmation ( keys %$question ) {
$template->param(
$needsconfirmation => $$question{$needsconfirmation},
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index cf8c722..0082ec2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -95,6 +95,7 @@ $.tablesorter.addParser({
<!-- TMPL_IF NAME="USERBLOCKEDREMAINING" --><li><!--TMPL_VAR
Name="USERBLOCKEDREMAINING"--> Overdues</li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="NOT_FOR_LOAN_CAN_FORCING" --><li>Item not for loan, are you
sure you want to check it out ?</p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="PATRON_CANT" --><li>This patron can't check out this item
per library circulation policy</li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="NOT_FOR_LOAN_CAN_FORCE" --><li>Item is normally not for
loan. Check out anyway?</li><!-- /TMPL_IF -->
</ul>
<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
--
1.6.0.4
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
