Attachment 75602 Details for Bug 20763 – Bug 20763: AllowPurchaseSuggestionBranchChoice triggers error opac-suggestions.pl is visited without logging in

[patch] Bug 20763: AllowPurchaseSuggestionBranchChoice triggers error opac-suggestions.pl is visited without logging in

Bug-20763-AllowPurchaseSuggestionBranchChoice-trig.patch (text/plain), 2.21 KB, created by Jonathan Druart on 2018-05-28 19:38:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-05-28 19:38:15 UTC

Size: 2.21 KB

patch

obsolete

>From 8fd3724fcfa4efa01f743d552257e43666f37bc3 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatetsolutions.com>
>Date: Mon, 14 May 2018 08:45:00 -0400
>Subject: [PATCH] Bug 20763: AllowPurchaseSuggestionBranchChoice triggers error
> opac-suggestions.pl is visited without logging in
>
>Some code executed in the script opac-suggestions.pl if the system preference AllowPurchaseSuggestionBranchChoice is enabled assumes there is a logged in user. If there is not, patrons will see the error "Internal Server Error".
>
>Test Plan:
>1) Enable AllowPurchaseSuggestionBranchChoice
>2) Enable AnonSuggestions
>3) In the OPAC, perform a search that will have no results,
>   click the "Make a purchase suggestion" link.
>4) Note the error
>5) Apply this patch
>6) Reload the page
>7) The page should load now!
>
>Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe@inLibro.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> opac/opac-suggestions.pl | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
>diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
>index e086b14ffb..c29278cf89 100755
>--- a/opac/opac-suggestions.pl
>+++ b/opac/opac-suggestions.pl
>@@ -196,16 +196,18 @@ my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
> 
> # Is the person allowed to choose their branch
> if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) {
>+    my $branchcode = $input->param('branchcode') || q{};
> 
>-# pass the pickup branch along....
>-    my $userbranch = '';
>-    if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
>-        $userbranch = C4::Context->userenv->{'branch'};
>+    if ( !$branchcode && $borrowernumber ) {
>+        my $patron = Koha::Patrons->find($borrowernumber);
>+        $branchcode = $patron->branchcode;
>     }
>-    my $branchcode = $input->param('branchcode');
>-    unless ( $branchcode ) {
>-        my $patron = Koha::Patrons->find( $borrowernumber );
>-        $branchcode = $patron->branchcode || $userbranch || '' ;
>+
>+    if (   !$branchcode
>+        && C4::Context->userenv
>+        && C4::Context->userenv->{branch} )
>+    {
>+        $branchcode = C4::Context->userenv->{branch};
>     }
> 
>     $template->param( branchcode => $branchcode );
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20763: 75302 | 75567 | 75602 | 75603 | 75623