[freeside-commits] branch master updated. f921a017cd3dd987bd48e05c7fd462a1ef9cb79d

[Ivan]

The branch, master has been updated
       via  f921a017cd3dd987bd48e05c7fd462a1ef9cb79d (commit)
       via  a9129b5b8b7a69d1d0a7fce6dc9d72665eaec568 (commit)
      from  95606bc9db41352511c886773a311f2166cc6cf2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f921a017cd3dd987bd48e05c7fd462a1ef9cb79d
Merge: a9129b5 95606bc
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed May 6 19:10:47 2015 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit a9129b5b8b7a69d1d0a7fce6dc9d72665eaec568
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed May 6 19:09:06 2015 -0700

    don't send when password is supplied, RT#34705

diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index 89bfb74..38b7fd7 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -259,7 +259,10 @@ sub insert {
   }
 
   if (      $link_hash{'selfservice_access'} eq 'R'
-       or ( $link_hash{'selfservice_access'} && $cust_contact )
+       or ( $link_hash{'selfservice_access'}
+            && $cust_contact
+            && ! length($self->_password)
+          )
      )
   {
     my $error = $self->send_reset_email( queue=>1 );

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/contact.pm |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)