don't try and put properties on email if basic email is not configured

This commit is contained in:
Henry Oswald 2016-06-27 15:19:43 +01:00
parent f7a79e8c78
commit 2795a04ffa

View file

@ -459,12 +459,12 @@ if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]?
secure: process.env["SHARELATEX_EMAIL_SMTP_SECURE"] secure: process.env["SHARELATEX_EMAIL_SMTP_SECURE"]
ignoreTLS: process.env["SHARELATEX_EMAIL_SMTP_IGNORE_TLS"] ignoreTLS: process.env["SHARELATEX_EMAIL_SMTP_IGNORE_TLS"]
if process.env["SHARELATEX_EMAIL_SMTP_USER"]? or process.env["SHARELATEX_EMAIL_SMTP_PASS"]? if process.env["SHARELATEX_EMAIL_SMTP_USER"]? or process.env["SHARELATEX_EMAIL_SMTP_PASS"]?
settings.email.parameters.auth = settings.email.parameters.auth =
user: process.env["SHARELATEX_EMAIL_SMTP_USER"] user: process.env["SHARELATEX_EMAIL_SMTP_USER"]
pass: process.env["SHARELATEX_EMAIL_SMTP_PASS"] pass: process.env["SHARELATEX_EMAIL_SMTP_PASS"]
if process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]? if process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]?
settings.email.parameters.tls = settings.email.parameters.tls =
rejectUnauthorized: process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"] rejectUnauthorized: process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]