Attachment 129868 Details for Bug 29954 – Bug 29954: Rename _unset calls to unset

[patch] Bug 29954: Rename _unset calls to unset

Bug-29954-Rename-unset-calls-to-unset.patch (text/plain), 3.14 KB, created by Marcel de Rooy on 2022-01-27 11:11:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

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

Size: 3.14 KB

patch

obsolete

>From ce12773f9b8eaf35436c2b5ba9d1805115b200f1 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Thu, 27 Jan 2022 10:53:34 +0000
>Subject: [PATCH] Bug 29954: Rename _unset calls to unset
>Content-Type: text/plain; charset=utf-8
>
>---
> C4/Auth.pm        | 10 +++++-----
> C4/InstallAuth.pm |  4 ++--
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 0da2e7cc03..30926af608 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');
>diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm
>index bb868aa33e..83b72493cf 100644
>--- a/C4/InstallAuth.pm
>+++ b/C4/InstallAuth.pm
>@@ -269,7 +269,7 @@ sub checkauth {
>         if ($logout) {
> 
>             # voluntary logout the user
>-            C4::Context->_unset_userenv($sessionID);
>+            C4::Context->unset_userenv($sessionID);
>             $sessionID = undef;
>             $userid    = undef;
> 	   # Commented out due to its lack of usefulness
>@@ -332,7 +332,7 @@ sub checkauth {
>         else {
>             if ($userid) {
>                 $info{'invalid_username_or_password'} = 1;
>-                C4::Context->_unset_userenv($sessionID);
>+                C4::Context->unset_userenv($sessionID);
>             }
>         }
>     }
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

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