diff --git a/application/core/LimeMailer.php b/application/core/LimeMailer.php index a4e5e4118c4..fdb20ee5e04 100644 --- a/application/core/LimeMailer.php +++ b/application/core/LimeMailer.php @@ -196,6 +196,20 @@ public function __construct($exceptions = false) */ public function init() { + $this->debug = []; + $this->ContentType = self::CONTENT_TYPE_PLAINTEXT; + $this->clearCustomHeaders(); + $this->clearAddresses(); + $this->clearAttachments(); + $this->oToken = null; + $this->Subject = ""; + $this->Body = ""; + $this->AltBody = ""; + $this->rawSubject = ""; + $this->rawBody = ""; + $this->AltBody = ""; + $this->MIMEBody = ""; + $this->MIMEHeader = ""; $this->setFrom(Yii::app()->getConfig('siteadminemail'),Yii::app()->getConfig('siteadminname')); /* set default return path */ if(!empty(Yii::app()->getConfig('siteadminbounce'))) { @@ -219,14 +233,10 @@ public static function getInstance($reset=self::ResetBase) } /* Some part must be always resetted */ if ($reset) { - self::$instance->clearAddresses(); // Unset only $this->to recepient - self::$instance->clearAttachments(); // Unset attachments (maybe only under condition ?) - self::$instance->oToken = null; - self::$instance->eventName = 'beforeEmail'; + self::$instance->init(); if(self::$instance->surveyId) { - self::$instance->eventName = 'beforeSurveyEmail'; + self::$instance->setSurvey(self::$instance->surveyId); } - self::$instance->debug = []; } return self::$instance;