use noreply address as fallback if no incoming email address exists

darcs-hash:20080804133933-84dde-189f0ee39bf1000fbb648144fadcf9a9263c4b38.gz

diff --git a/lib/mail.php b/lib/mail.php
index f9fb4b77b3d65bc9815a662dd1755829e4eb9ad2..e6c7ee0e2a9a8e5e66be4edd95a6bb1bf36fe868 100644 (file)
--- 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());