summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-08-04 09:39:33 -0400
committerEvan Prodromou <evan@prodromou.name>2008-08-04 09:39:33 -0400
commitf0f6d0e60349f28e71b8fc1fa995a9daca326c12 (patch)
tree3e4b6de4eab6ff9e4af97a504d1a087413b9bf4e /lib
parentf2203d1df626d4c5d4a364958e15b938ca4fcb84 (diff)
use noreply address as fallback if no incoming email address exists
darcs-hash:20080804133933-84dde-189f0ee39bf1000fbb648144fadcf9a9263c4b38.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/mail.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mail.php b/lib/mail.php
index f9fb4b77b..e6c7ee0e2 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -197,7 +197,7 @@ function mail_send_sms_notice($notice, $user) {
common_log(LOG_INFO, "Sending notice " . $notice->id . " to " . $user->smsemail, __FILE__);
$headers = array();
- $headers['From'] = $user->incomingemail;
+ $headers['From'] = (isset($user->incomingemail)) ? $user->incomingemail : mail_notify_from();
$headers['To'] = $to;
$headers['Subject'] = sprintf(_('%s status'),
$other->getBestName());