From: Evan Prodromou <evan@prodromou.name>
Date: Mon, 4 Aug 2008 13:39:33 +0000 (-0400)
Subject: use noreply address as fallback if no incoming email address exists
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f0f6d0e60349f28e71b8fc1fa995a9daca326c12;p=quix0rs-gnu-social.git

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 f9fb4b77b3..e6c7ee0e2a 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());