diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-09 13:50:35 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-09 13:50:35 +0000 |
| commit | 279e93e613d2312a69cc9af3db150e90ccc3c80f (patch) | |
| tree | 0a2299776799c3ad5f9f7cf65053aa598c90a837 /engine | |
| parent | d7237134d36a3c072edc474f963d137ed814f7be (diff) | |
| download | elgg-279e93e613d2312a69cc9af3db150e90ccc3c80f.tar.gz elgg-279e93e613d2312a69cc9af3db150e90ccc3c80f.tar.bz2 | |
Removed toggle since it broke the handler prototype
git-svn-id: https://code.elgg.org/elgg/trunk@1359 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/notification.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engine/lib/notification.php b/engine/lib/notification.php index e711b8bc5..1b466ecc3 100644 --- a/engine/lib/notification.php +++ b/engine/lib/notification.php @@ -206,10 +206,9 @@ * @param string $subject The subject of the message. * @param string $message The message body * @param array $params Optional parameters (none taken in this instance) - * @param bool $hide_sender If true (default) hide the sender's email address (use noreply@site...) * @return bool */ - function email_notify_handler(ElggEntity $from, ElggUser $to, $subject, $message, array $params = NULL, $hide_sender = true) + function email_notify_handler(ElggEntity $from, ElggUser $to, $subject, $message, array $params = NULL) { global $CONFIG; @@ -223,7 +222,7 @@ throw new NotificationException(sprintf(elgg_echo('NotificationException:NoEmailAddress'), $to->guid)); $to = $to->email; - if (!$hide_sender) + /*if (!$hide_sender) { if ($from->email) $from = $from->email; // Handle users @@ -236,8 +235,8 @@ $from = 'noreply@' . get_site_domain($CONFIG->site_guid); // Handle a fallback } } - else - $from = 'noreply@' . get_site_domain($CONFIG->site_guid); // Handle a fallback + else*/ + $from = 'noreply@' . get_site_domain($CONFIG->site_guid); // Handle a fallback $headers = "From: $from\r\n"; |