diff --git a/lib/WebGUI/Operation/Auth.pm b/lib/WebGUI/Operation/Auth.pm
index edaa94acb..bb1bae383 100644
--- a/lib/WebGUI/Operation/Auth.pm
+++ b/lib/WebGUI/Operation/Auth.pm
@@ -61,7 +61,7 @@ sub www_auth {
my $session = shift;
my $auth;
($auth) = $session->db->quickArray("select authMethod from users where username=".$session->db->quote($session->form->process("username"))) if($session->form->process("username"));
- my $authMethod = getInstance($auth);
+ my $authMethod = getInstance($session,$auth);
my $methodCall = shift || $session->form->process("method") || "init";
if(!$authMethod->isCallable($methodCall)){
$session->errorHandler->security("access uncallable auth method on page '".$session->asset->getTitle."' [".$session->asset->pageId."].");
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index fceea89da..ae66519c6 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -276,7 +276,7 @@ sub www_editSettings {
-extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\""
);
foreach (@{$session->config->get("authMethods")}) {
- my $authInstance = WebGUI::Operation::Auth::getInstance($_,1);
+ my $authInstance = WebGUI::Operation::Auth::getInstance($session,$_,1);
my $style = '" style="display: none;' unless ($_ eq $session->setting->get("authMethod"));
$tabform->getTab("auth")->raw('
'.$authInstance->editUserSettingsForm.'| | | |
');
}
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 403646097..7c2cb0df8 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -338,7 +338,7 @@ sub www_editUser {
-extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\""
);
foreach (@{$session->config->get("authMethods")}) {
- my $authInstance = WebGUI::Operation::Auth::getInstance($_,$u->userId);
+ my $authInstance = WebGUI::Operation::Auth::getInstance($session,$_,$u->userId);
my $style = '" style="display: none;' unless ($_ eq $u->authMethod);
$tabform->getTab("account")->raw(''.$authInstance->editUserForm.'| | | |
');
}
diff --git a/lib/WebGUI/User.pm b/lib/WebGUI/User.pm
index d92fe4ec9..b7fd49d17 100644
--- a/lib/WebGUI/User.pm
+++ b/lib/WebGUI/User.pm
@@ -137,15 +137,15 @@ Deletes this user.
sub delete {
my $self = shift;
$self->uncache;
- require WebGUI::Operation::Auth;
- $self->session->db->write("delete from users where userId=".$self->session->db->quote($self->{_userId}));
- $self->session->db->write("delete from userProfileData where userId=".$self->session->db->quote($self->{_userId}));
foreach my $groupId (@{$self->session->user->getGroups($self->userId)}) {
WebGUI::Group->new($self->session,$groupId)->deleteUsers([$self->userId]);
}
$self->session->db->write("delete from messageLog where userId=".$self->session->db->quote($self->{_userId}));
- my $authMethod = WebGUI::Operation::Auth::getInstance($self->authMethod,$self->{_userId});
+ require WebGUI::Operation::Auth;
+ my $authMethod = WebGUI::Operation::Auth::getInstance($self->session,$self->authMethod,$self->{_userId});
$authMethod->deleteParams($self->{_userId});
+ $self->session->db->write("delete from userProfileData where userId=".$self->session->db->quote($self->{_userId}));
+ $self->session->db->write("delete from users where userId=".$self->session->db->quote($self->{_userId}));
}
#-------------------------------------------------------------------