Fixes setting from & from_name when form isn't saved to database.

exponentcms · Apr 15, 2011 · 7bce2cd · 7bce2cd
1 parent 2383d2e
commit 7bce2cd
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/modules/formbuilder/actions/submit_form.php b/modules/formbuilder/actions/submit_form.php
@@ -81,12 +81,6 @@
 				$from_name = $user->firstname." ".$user->lastname." (".$user->username.")";
             } else {
                 $db_data->user_id = 0;
-				if (empty($from)) {
-					$from = trim(SMTP_FROMADDRESS);
-				}
-				if (empty($from_name)) {
-					$from_name = trim(ORGANIZATION_NAME);
-				}
             }
             $db_data->timestamp = time();
         }        
@@ -124,6 +118,12 @@
         $template->assign("is_email",1);
         $emailHtml = $template->render();
 		$emailText = chop(strip_tags(str_replace(array("<br />","<br>","br/>"),"\n",$emailHtml)));
+		if (empty($from)) {
+			$from = trim(SMTP_FROMADDRESS);
+		}
+		if (empty($from_name)) {
+			$from_name = trim(ORGANIZATION_NAME);
+		}
 
         if (count($emaillist)) {
             //This is an easy way to remove duplicates