Attachment 129870 Details for Bug 29954 – Bug 29954: Fix calls in Auth.pm

[patch] Bug 29954: Fix calls in Auth.pm

Bug-29954-Fix-calls-in-Authpm.patch (text/plain), 2.42 KB, created by Marcel de Rooy on 2022-01-27 11:11:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2022-01-27 11:11:41 UTC

Size: 2.42 KB

patch

obsolete

>From e5e579beb50bbfaea1ad6e3835b447b30e200233 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Thu, 27 Jan 2022 10:57:39 +0000
>Subject: [PATCH] Bug 29954: Fix calls in Auth.pm
>Content-Type: text/plain; charset=utf-8
>
>Back to class method calls (temporary fix from 29915).
>---
> C4/Auth.pm | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 0d2a9f2d01..2203134d84 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -888,7 +888,7 @@ sub checkauth {
>                 $anon_search_history = $session->param('search_history');
>                 $session->delete();
>                 $session->flush;
>-                C4::Context::unset_userenv($sessionID);
>+                C4::Context->unset_userenv($sessionID);
>                 $sessionID = undef;
>             }
>             elsif ($logout) {
>@@ -898,7 +898,7 @@ sub checkauth {
>                 my $shibSuccess = C4::Context->userenv->{'shibboleth'};
>                 $session->delete();
>                 $session->flush;
>-                C4::Context::unset_userenv($sessionID);
>+                C4::Context->unset_userenv($sessionID);
>                 $sessionID = undef;
> 
>                 if ($cas and $caslogout) {
>@@ -1091,7 +1091,7 @@ sub checkauth {
>                 }
>                 else {
>                     $info{'nopermission'} = 1;
>-                    C4::Context::unset_userenv($sessionID);
>+                    C4::Context->unset_userenv($sessionID);
>                 }
>                 my ( $borrowernumber, $firstname, $surname, $userflags,
>                     $branchcode, $branchname, $emailaddress, $desk_id,
>@@ -1209,7 +1209,7 @@ sub checkauth {
>             else {
>                 if ($userid) {
>                     $info{'invalid_username_or_password'} = 1;
>-                    C4::Context::unset_userenv($sessionID);
>+                    C4::Context->unset_userenv($sessionID);
>                 }
>                 $session->param( 'lasttime', time() );
>                 $session->param( 'ip',       $session->remote_addr() );
>@@ -1671,7 +1671,7 @@ sub check_cookie_auth {
>     unless ( $sessionID ) {
>         return ( "failed", undef );
>     }
>-    C4::Context::unset_userenv($sessionID); # remove old userenv first
>+    C4::Context->unset_userenv($sessionID); # remove old userenv first
>     my $session   = get_session($sessionID);
>     if ($session) {
>         my $userid   = $session->param('id');
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 29954: 129867 | 129868 | 129869 | 129870