Removes compatibility with non-hruid code (please use core-1.0.0 for non-hruid-compat...

[platal.git] / classes / plmailer.php

diff --git a/classes/plmailer.php b/classes/plmailer.php
index ca85633..08e71f8 100644 (file)
--- a/classes/plmailer.php
+++ b/classes/plmailer.php
@@ -312,10 +312,6 @@ class PlMailer extends Mail_Mime {
         $this->processPage($with_html);
         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);
         }
         $addrs = Array();
         foreach(Array('To', 'Cc', 'Bcc') as $hdr) {