[Gemstracker-svn] SF.net SVN: gemstracker:[511] trunk

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

Revision: 511
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=511&view=rev
Author:   matijsdejong
Date:     2012-02-23 10:52:42 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Added revisions 508 & 510 from tags/1.5.1 

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/DatabaseAction.php
    trunk/library/classes/Gems/Email/EmailFormAbstract.php
    trunk/library/classes/Gems/Email/OneMailForm.php

Property Changed:
----------------
    trunk/
    trunk/library/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489
   + /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510


Property changes on: trunk/library
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489
   + /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510

Modified: trunk/library/classes/Gems/Default/DatabaseAction.php
===================================================================
--- trunk/library/classes/Gems/Default/DatabaseAction.php	2012-02-23 10:07:53 UTC (rev 510)
+++ trunk/library/classes/Gems/Default/DatabaseAction.php	2012-02-23 10:52:42 UTC (rev 511)
@@ -243,6 +243,7 @@
         $model = $this->getModel();
 
         if ($model->isMeta('action', 'show')) {
+            $table->tr();
             $table->tdh($this->_('Structure'));
             $table->td($this->getFieldTable($this->_getParam(MUtil_Model::REQUEST_ID)));
         }

Modified: trunk/library/classes/Gems/Email/EmailFormAbstract.php
===================================================================
--- trunk/library/classes/Gems/Email/EmailFormAbstract.php	2012-02-23 10:07:53 UTC (rev 510)
+++ trunk/library/classes/Gems/Email/EmailFormAbstract.php	2012-02-23 10:52:42 UTC (rev 511)
@@ -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: trunk/library/classes/Gems/Email/OneMailForm.php
===================================================================
--- trunk/library/classes/Gems/Email/OneMailForm.php	2012-02-23 10:07:53 UTC (rev 510)
+++ trunk/library/classes/Gems/Email/OneMailForm.php	2012-02-23 10:52:42 UTC (rev 511)
@@ -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.