CRM-18472: Notice fixes

----------------------------------------
* CRM-18472: Notice fixes
  https://issues.civicrm.org/jira/browse/CRM-18472

diff --git a/CRM/Contact/Form/Task/LabelCommon.php b/CRM/Contact/Form/Task/LabelCommon.php
index 4a9890cef6d4b5b414458ea349bae417d1995965..076f7954dee25b161e3bda2400ee1b4a35f31608 100644 (file)
--- a/CRM/Contact/Form/Task/LabelCommon.php
+++ b/CRM/Contact/Form/Task/LabelCommon.php
@@ -53,13 +53,15 @@ class CRM_Contact_Form_Task_LabelCommon {
 
     //build contact string that needs to be printed
     $val = NULL;
-    foreach ($contactRows as $row => $value) {
-      foreach ($value as $k => $v) {
-        $val .= "$v\n";
-      }
+    if (!empty($contactRows)) {
+      foreach ($contactRows as $row => $value) {
+        foreach ($value as $k => $v) {
+          $val .= "$v\n";
+        }
 
-      $pdf->AddPdfLabel($val);
-      $val = '';
+        $pdf->AddPdfLabel($val);
+        $val = '';
+      }
     }
     $pdf->Output($fileName, 'D');
   }
@@ -80,6 +82,7 @@ class CRM_Contact_Form_Task_LabelCommon {
    */
   public static function getRows($contactIDs, $locationTypeID, $respectDoNotMail, $mergeSameAddress, $mergeSameHousehold) {
     $locName = NULL;
+    $rows = array();
     //get the address format sequence from the config file
     $addressReturnProperties = CRM_Contact_Form_Task_LabelCommon::getAddressReturnProperties();
 

diff --git a/CRM/Member/Form/Task/Label.php b/CRM/Member/Form/Task/Label.php
index ab89e930b0efad0192563ab83163ca5d087c32f8..6f38b9d969626e7dd76ec01ee7ff5f0f5c9a0028 100644 (file)
--- a/CRM/Member/Form/Task/Label.php
+++ b/CRM/Member/Form/Task/Label.php
@@ -111,19 +111,21 @@ class CRM_Member_Form_Task_Label extends CRM_Member_Form_Task {
       $individualFormat = TRUE;
     }
     // format the addresses according to CIVICRM_ADDRESS_FORMAT (CRM-1327)
-    foreach ($rows as $id => $row) {
-      if ($commMethods = CRM_Utils_Array::value('preferred_communication_method', $row)) {
-        $val = array_filter(explode(CRM_Core_DAO::VALUE_SEPARATOR, $commMethods));
-        $comm = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'preferred_communication_method');
-        $temp = array();
-        foreach ($val as $vals) {
-          $temp[] = $comm[$vals];
+    if (!empty($rows)) {
+      foreach ($rows as $id => $row) {
+        if ($commMethods = CRM_Utils_Array::value('preferred_communication_method', $row)) {
+          $val = array_filter(explode(CRM_Core_DAO::VALUE_SEPARATOR, $commMethods));
+          $comm = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'preferred_communication_method');
+          $temp = array();
+          foreach ($val as $vals) {
+            $temp[] = $comm[$vals];
+          }
+          $row['preferred_communication_method'] = implode(', ', $temp);
         }
-        $row['preferred_communication_method'] = implode(', ', $temp);
-      }
-      $row['id'] = $id;
-      $formatted = CRM_Utils_Address::format($row, 'mailing_format', FALSE, TRUE, $individualFormat, $tokenFields);
-      $rows[$id] = array($formatted);
+        $row['id'] = $id;
+        $formatted = CRM_Utils_Address::format($row, 'mailing_format', FALSE, TRUE, $individualFormat, $tokenFields);
+        $rows[$id] = array($formatted);
+      } 
     }
 
     if ($isPerMembership) {