[Gemstracker-svn] SF.net SVN: gemstracker:[509] tags/1.5.1/library/classes/Gems/Email

[<gem...@li...>]

Revision: 509
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=509&view=rev
Author:   matijsdejong
Date:     2012-02-23 10:00:44 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Bugs preventing sending of mail

Modified Paths:
--------------
    tags/1.5.1/library/classes/Gems/Email/EmailFormAbstract.php
    tags/1.5.1/library/classes/Gems/Email/OneMailForm.php

Modified: tags/1.5.1/library/classes/Gems/Email/EmailFormAbstract.php
===================================================================
--- tags/1.5.1/library/classes/Gems/Email/EmailFormAbstract.php	2012-02-22 19:20:42 UTC (rev 508)
+++ tags/1.5.1/library/classes/Gems/Email/EmailFormAbstract.php	2012-02-23 10:00:44 UTC (rev 509)
@@ -241,6 +241,7 @@
 
             if ($email = $this->escort->project->email['site']) {
                 $options['S'] = $this->_createMultiOption(array(), $this->escort->project->name, $email);
+                $valid[]     = 'S';
             }
         }
 
@@ -252,6 +253,7 @@
             'required'     => true,
             ));
 
+
         $element->addValidator('InArray', false, array('haystack' => $valid));
 
         $this->defaultFrom = reset($valid);

Modified: tags/1.5.1/library/classes/Gems/Email/OneMailForm.php
===================================================================
--- tags/1.5.1/library/classes/Gems/Email/OneMailForm.php	2012-02-22 19:20:42 UTC (rev 508)
+++ tags/1.5.1/library/classes/Gems/Email/OneMailForm.php	2012-02-23 10:00:44 UTC (rev 509)
@@ -132,6 +132,7 @@
         } else {
             $tokenData = $this->getTokenData();
 
+            $this->mailer->setFrom($this->getValue('from'));
             $this->mailer->setSubject($this->getValue('gmt_subject'));
             $this->mailer->setBody($this->getValue('gmt_body'));
             $this->mailer->setTemplateId($this->getValue('select_subject'));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.