Attachment 72362 Details for Bug 19160 – Bug 19160: (follow-up) Fix problems introduced by renaming logout_required to logout_if_required

[patch] Bug 19160: (follow-up) Fix problems introduced by renaming logout_required to logout_if_required

Bug-19160-follow-up-Fix-problems-introduced-by-ren.patch (text/plain), 1.86 KB, created by Kyle M Hall (khall) on 2018-03-02 13:44:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2018-03-02 13:44:34 UTC

Size: 1.86 KB

patch

obsolete

>From 9cfa155faebbd4ebf5ca9d040a0ae924965d8f2d Mon Sep 17 00:00:00 2001
>From: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
>Date: Wed, 7 Feb 2018 10:06:20 +0100
>Subject: [PATCH] Bug 19160: (follow-up) Fix problems introduced by renaming
> logout_required to logout_if_required
>
>Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> C4/Auth.pm          | 2 +-
> C4/Auth_with_cas.pm | 2 +-
> opac/opac-user.pl   | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 876fec5..e81134a 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -86,7 +86,7 @@ BEGIN {
>         }
>     }
>     if ($cas) {
>-        import C4::Auth_with_cas qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url logout_required);
>+        import C4::Auth_with_cas qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url logout_if_required);
>     }
> 
> }
>diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm
>index 08ff75f..08012da 100644
>--- a/C4/Auth_with_cas.pm
>+++ b/C4/Auth_with_cas.pm
>@@ -35,7 +35,7 @@ BEGIN {
> 	require Exporter;
> 	$debug = $ENV{DEBUG};
> 	@ISA    = qw(Exporter);
>-	@EXPORT = qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url);
>+	@EXPORT = qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url logout_if_required);
> }
> my $defaultcasserver;
> my $casservers;
>diff --git a/opac/opac-user.pl b/opac/opac-user.pl
>index 317ba6a..bdd002d 100755
>--- a/opac/opac-user.pl
>+++ b/opac/opac-user.pl
>@@ -64,7 +64,7 @@ BEGIN {
> 
> # CAS single logout handling
> # Will print header and exit
>-C4::Context->preference('casAuthentication') and C4::Auth_with_ldap::logout_if_required($query);
>+C4::Context->preference('casAuthentication') and C4::Auth_with_cas::logout_if_required($query);
> 
> my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
>     {
>-- 
>2.10.2

Actions: View | Diff | Splinter Review

Attachments on bug 19160: 66285 | 66306 | 70408 | 70440 | 70441 | 70442 | 71829 | 71830 | 71831 | 71832 | 71833 | 71834 | 71835 | 72358 | 72359 | 72360 | 72361 | 72362 | 72363 | 72364