From 762a8e1129db2de6c16ddcac9c0fd00bbb9a6b68 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Mon, 29 Oct 2007 13:21:39 -0500 Subject: [PATCH] Fixing mess in Auth.pm Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- C4/Auth.pm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 2122450be7..ce0824b26c 100755 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -406,7 +406,6 @@ sub checkauth { $loggedin = 1; } elsif ( $sessionID = $query->cookie("CGISESSID")) { -<<<<<<< HEAD:C4/Auth.pm my $storage_method = C4::Context->preference('SessionStorage'); my $session; if ($storage_method eq 'mysql'){ @@ -416,10 +415,6 @@ sub checkauth { # catch all defaults to tmp should work on all systems $session = new CGI::Session("driver:File", $sessionID, {Directory=>'/tmp'}); } -======= -# my $session = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh}); - my $session = new CGI::Session("driver:File", $sessionID, {Directory=>'/tmp'}); ->>>>>>> Commenting out some noisy warns:C4/Auth.pm C4::Context->_new_userenv($sessionID); if ($session){ C4::Context::set_userenv( -- 2.11.0