CRM-19423 - Move required behavior of mail_format to formrule

diff --git a/CRM/Contact/Form/Edit/CommunicationPreferences.php b/CRM/Contact/Form/Edit/CommunicationPreferences.php
index 378cd563c66dc5690097f93bd031a332dc4f568b..2bb555f81b3eb460274cfe34e7522a5961affd70 100644 (file)
--- a/CRM/Contact/Form/Edit/CommunicationPreferences.php
+++ b/CRM/Contact/Form/Edit/CommunicationPreferences.php
@@ -84,7 +84,7 @@ class CRM_Contact_Form_Edit_CommunicationPreferences {
     //using for display purpose.
     $form->assign('commPreference', $commPreference);
 
-    $form->addField('preferred_mail_format', array('entity' => 'contact', 'label' => ts('Email Format')), TRUE);
+    $form->addField('preferred_mail_format', array('entity' => 'contact', 'label' => ts('Email Format')));
 
     $form->addField('is_opt_out', array('entity' => 'contact', 'label' => ts('NO BULK EMAILS (User Opt Out)')));
 
@@ -138,6 +138,10 @@ class CRM_Contact_Form_Edit_CommunicationPreferences {
         );
       }
     }
+
+    if (array_key_exists('preferred_mail_format', $fields) && empty($fields['preferred_mail_format'])) {
+      $errors['preferred_mail_format'] = ts('Please select an email format preferred by this contact.');
+    }
     return empty($errors) ? TRUE : $errors;
   }