projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort customer locations in package list, RT#41119, RT#39822
[freeside.git]
/
FS
/
FS
/
access_user.pm
diff --git
a/FS/FS/access_user.pm
b/FS/FS/access_user.pm
index
3a12ef3
..
3b36e46
100644
(file)
--- a/
FS/FS/access_user.pm
+++ b/
FS/FS/access_user.pm
@@
-161,7
+161,8
@@
sub delete {
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
- my $error = $self->SUPER::delete(@_);
+ my $error = $self->delete_password_history
+ || $self->SUPER::delete(@_);
if ( $error ) {
$dbh->rollback or die $dbh->errstr if $oldAutoCommit;
if ( $error ) {
$dbh->rollback or die $dbh->errstr if $oldAutoCommit;
@@
-738,7
+739,6
@@
sub change_password_fields {
sub locale {
my $self = shift;
return $self->{_locale} if exists($self->{_locale});
sub locale {
my $self = shift;
return $self->{_locale} if exists($self->{_locale});
-warn "access_user->locale called\n";
$self->{_locale} = $self->option('locale');
}
$self->{_locale} = $self->option('locale');
}