merging 6.2.9 changes
This commit is contained in:
parent
1bb82bd7b9
commit
48caad2d74
42 changed files with 224 additions and 119 deletions
|
|
@ -146,7 +146,7 @@ sub createAccountSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub deactivateAccount {
|
||||
my $self = shift;
|
||||
return $self->displayLogin if($self->userId == 1);
|
||||
return $self->displayLogin if($self->userId eq '1');
|
||||
return $self->SUPER::deactivateAccount("deactivateAccountConfirm");
|
||||
}
|
||||
|
||||
|
|
@ -161,7 +161,7 @@ sub deactivateAccountConfirm {
|
|||
sub displayAccount {
|
||||
my $self = shift;
|
||||
my $vars;
|
||||
return $self->displayLogin($_[0]) if ($self->userId == 1);
|
||||
return $self->displayLogin($_[0]) if ($self->userId eq '1');
|
||||
$vars->{displayTitle} = '<h1>'.WebGUI::International::get(61).'</h1>';
|
||||
$vars->{'account.message'} = WebGUI::International::get(856);
|
||||
if($session{setting}{useKarma}){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue