X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_user.pm;h=3b36e46f00ce175831bb7b9e1e0081069b7745f2;hb=7109ab0b7108ee365fbc958eaaf9e473f2332c08;hp=77706b1db4e71f91464d2476d7a1cbf7deadd52c;hpb=101264df51f2ae06f9cabf4b394bbee3bc7fedf9;p=freeside.git

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index 77706b1db..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;
@@ -731,6 +732,16 @@ sub change_password_fields {
   FS::Auth->auth_class->change_password_fields( @_ );
 }
 
+=item locale
+
+=cut
+
+sub locale {
+  my $self = shift;
+  return $self->{_locale} if exists($self->{_locale});
+  $self->{_locale} = $self->option('locale');
+}
+
 =back
 
 =head1 BUGS