From 4d19f60bf464fe76ca5a371976a9e7fb681ad098 Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Sat, 23 Aug 2008 17:42:19 +0200 Subject: [PATCH] Updates class PlMailer to use the new User object. Signed-off-by: Vincent Zanotti --- classes/plmailer.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/plmailer.php b/classes/plmailer.php index 2106d50..95e5a5c 100644 --- a/classes/plmailer.php +++ b/classes/plmailer.php @@ -295,7 +295,10 @@ class PlMailer extends Mail_Mime { public function send($with_html = true) { $this->processPage($with_html); - if (S::v('forlife')) { + if (S::user()) { + $this->addHeader('X-Org-Mail', S::user()->forlifeEmail()); + } else if (S::v('forlife')) { + // TODO(vzanotti): trash this code when hruid will be part of master. global $globals; $this->addHeader('X-Org-Mail', S::v('forlife') . '@' . $globals->mail->domain); } -- 2.1.4