Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-14-00-44-17

[civicrm-core.git] / CRM / Contact / Form / Inline / Email.php

diff --git a/CRM/Contact/Form/Inline/Email.php b/CRM/Contact/Form/Inline/Email.php
index b801656e85259daa09c54b43f77991eb948eb754..243889f033ad3836b4d6f9184d956396a6c68ac5 100644 (file)
--- a/CRM/Contact/Form/Inline/Email.php
+++ b/CRM/Contact/Form/Inline/Email.php
@@ -108,13 +108,13 @@ class CRM_Contact_Form_Inline_Email extends CRM_Contact_Form_Inline {
    */
   static function formRule($fields, $errors) {
     $hasData = $hasPrimary = $errors = array();
-    if (CRM_Utils_Array::value('email', $fields) && is_array($fields['email'])) {
+    if (!empty($fields['email']) && is_array($fields['email'])) {
       foreach ($fields['email'] as $instance => $blockValues) {
         $dataExists = CRM_Contact_Form_Contact::blockDataExists($blockValues);
 
         if ($dataExists) {
           $hasData[] = $instance;
-          if (CRM_Utils_Array::value('is_primary', $blockValues)) {
+          if (!empty($blockValues['is_primary'])) {
             $hasPrimary[] = $instance;
             }
           }