From c0a59a7bf30183bb31a88ea8bed86b0f2e98a196 Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Fri, 7 Aug 2009 02:13:53 +0000
Subject: [PATCH] Fixed Error when trying to add/edit email recipient in CMS

---
 code/UserDefinedForm.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/UserDefinedForm.php b/code/UserDefinedForm.php
index 615b739..67b3066 100755
--- a/code/UserDefinedForm.php
+++ b/code/UserDefinedForm.php
@@ -598,10 +598,12 @@ class UserDefinedForm_EmailRecipient extends DataObject {
 			if($multiOptionFields || $validEmailFields) {
 				if($multiOptionFields && $validEmailFields) {
 					$multiOptionFields->merge($validEmailFields);
+					
 				}
-				else {
-					$multiOptionFields = $validEmailFields;
+				elseif(!$multiOptionFields) {
+					$multiOptionFields = $validEmailFields;	
 				}
+				
 				$multiOptionFields = $multiOptionFields->toDropdownMap('ID', 'Title');
 				$fields->insertAfter(new DropdownField('SendEmailToFieldID', _t('UserDefinedForm.ORSELECTAFIELDTOUSEASTO', '.. or Select a Field to use as the To Address'), $multiOptionFields, '', null, ""), 'EmailAddress');
 			}