X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_user.pm;h=3b36e46f00ce175831bb7b9e1e0081069b7745f2;hb=0e56763a6b3898632d6f0c20c454eed9b0169342;hp=3a12ef3951189b9a057a41cf10908698da4deee5;hpb=f7329b766b496393064a4dd4df2515cbfbb00827;p=freeside.git

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index 3a12ef395..3b36e46f0 100644
--- 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;
 
-  my $error = $self->SUPER::delete(@_);
+  my $error = $self->delete_password_history
+           || $self->SUPER::delete(@_);
 
   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});
-warn "access_user->locale called\n";
   $self->{_locale} = $self->option('locale');
 }