COmanage Developers List

Author: skoranda
Date: 2013-10-24 14:01:25 -0400 (Thu, 24 Oct 2013)
New Revision: 624

Modified:
   registry/trunk/app/Model/CoInvite.php
Log:
Email verification empty body fix (CO-711)

Modified: registry/trunk/app/Model/CoInvite.php
===================================================================
--- registry/trunk/app/Model/CoInvite.php       2013-10-22 23:23:58 UTC (rev 
623)
+++ registry/trunk/app/Model/CoInvite.php       2013-10-24 18:01:25 UTC (rev 
624)
@@ -304,26 +304,30 @@
           }
           
           $msgBody = $this->processTemplate($template, $viewVariables);
+
+          // If this enrollment has a default email address set, use it, 
otherwise leave in the default for the site.
+          if($fromEmail) {
+            $email->from($fromEmail);
+          }
           
           $email->emailFormat('text')
                 ->to($toEmail)
                 ->subject($msgSubject)
-                ->message($msgBody);
+                ->send($msgBody);
         } else {
           $email->template('coinvite', 'basic')
                 ->emailFormat('text')
                 ->to($toEmail)
                 ->viewVars($viewVariables)
                 ->subject(_txt('em.invite.subject', array($coName)));
+
+          // If this enrollment has a default email address set, use it, 
otherwise leave in the default for the site.
+          if($fromEmail) {
+            $email->from($fromEmail);
+          }
+
+         $email->send();
         }
-        
-        // If this enrollment has a default email address set, use it, 
otherwise leave in the default for the site.
-        if($fromEmail) {
-          $email->from($fromEmail);
-        }
-        
-        // Send the email
-        $email->send();
       } catch(Exception $e) {
         throw new RuntimeException($e->getMessage());
       }