[freeside-commits] branch FREESIDE_3_BRANCH updated. 5316c7deaf01870af0b26035bb194e3d873b027d

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  5316c7deaf01870af0b26035bb194e3d873b027d (commit)
       via  832ae1aae9af2f15dc9b513c6505db25462ac511 (commit)
      from  3f36e519d061f6ca0102ba7887e9fee9b1bda874 (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 5316c7deaf01870af0b26035bb194e3d873b027d
Merge: 832ae1a 3f36e51
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed May 6 19:10:52 2015 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


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

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

diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index e004cf8..96632ff 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -179,7 +179,7 @@ sub insert {
     }
   }
 
-  if ( $self->selfservice_access ) {
+  if ( $self->selfservice_access && ! length($self->_password) ) {
     my $error = $self->send_reset_email( queue=>1 );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;

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

Summary of changes:
 FS/FS/contact.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)