merging 6.2.9 changes
This commit is contained in:
parent
1bb82bd7b9
commit
48caad2d74
42 changed files with 224 additions and 119 deletions
|
|
@ -33,7 +33,7 @@ Get the instance of this object or create a new instance if none exists
|
|||
sub getInstance {
|
||||
#Get Auth Settings
|
||||
my $authMethod = $session{user}{authMethod} || $session{setting}{authMethod};
|
||||
$authMethod = $session{setting}{authMethod} if($session{user}{userId} == 1);
|
||||
$authMethod = $session{setting}{authMethod} if($session{user}{userId} eq '1');
|
||||
$authMethod = $_[0] if($_[0] && isIn($_[0], @{$session{config}{authMethods}}));
|
||||
my $userId = $_[1];
|
||||
#Create Auth Object
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue