more bug fixes
This commit is contained in:
parent
5a58632ee0
commit
07c7cf6098
2 changed files with 3 additions and 2 deletions
|
|
@ -32,7 +32,7 @@ Get the instance of this object or create a new instance if none exists
|
||||||
sub getInstance {
|
sub getInstance {
|
||||||
my $session = shift;
|
my $session = shift;
|
||||||
#Get Auth Settings
|
#Get Auth Settings
|
||||||
my $authMethod = $session->user->profileField("authMethod") || $session->setting->get("authMethod");
|
my $authMethod = $session->user->get("authMethod") || $session->setting->get("authMethod");
|
||||||
$authMethod = $session->setting->get("authMethod") if($session->user->profileField("userId") eq '1');
|
$authMethod = $session->setting->get("authMethod") if($session->user->profileField("userId") eq '1');
|
||||||
$authMethod = $_[0] if($_[0] && isIn($_[0], @{$session->config->get("authMethods")}));
|
$authMethod = $_[0] if($_[0] && isIn($_[0], @{$session->config->get("authMethods")}));
|
||||||
my $userId = $_[1];
|
my $userId = $_[1];
|
||||||
|
|
|
||||||
|
|
@ -622,7 +622,8 @@ A reference to the current session.
|
||||||
|
|
||||||
sub new {
|
sub new {
|
||||||
my $class = shift;
|
my $class = shift;
|
||||||
bless {_session=>shift}, $class;
|
my $session = shift;
|
||||||
|
bless {_session=>$session}, $class;
|
||||||
}
|
}
|
||||||
|
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue