From 8b9bc2162bf37887dcfa1dabbf4f3b0c9a8fbcfe Mon Sep 17 00:00:00 2001
From: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Wed, 10 Aug 2016 15:41:16 +0530
Subject: [PATCH] clean up

---
 CRM/Contact/Form/Task/LabelCommon.php | 14 ++++++--------
 CRM/Member/Form/Task/Label.php        | 27 ++++++++++++---------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/CRM/Contact/Form/Task/LabelCommon.php b/CRM/Contact/Form/Task/LabelCommon.php
index 076f7954de..0b1b02a55a 100644
--- a/CRM/Contact/Form/Task/LabelCommon.php
+++ b/CRM/Contact/Form/Task/LabelCommon.php
@@ -53,15 +53,13 @@ class CRM_Contact_Form_Task_LabelCommon {
 
     //build contact string that needs to be printed
     $val = NULL;
-    if (!empty($contactRows)) {
-      foreach ($contactRows as $row => $value) {
-        foreach ($value as $k => $v) {
-          $val .= "$v\n";
-        }
-
-        $pdf->AddPdfLabel($val);
-        $val = '';
+    foreach ((array) $contactRows as $row => $value) {
+      foreach ($value as $k => $v) {
+        $val .= "$v\n";
       }
+
+      $pdf->AddPdfLabel($val);
+      $val = '';
     }
     $pdf->Output($fileName, 'D');
   }
diff --git a/CRM/Member/Form/Task/Label.php b/CRM/Member/Form/Task/Label.php
index 6f38b9d969..d888c1bb4a 100644
--- a/CRM/Member/Form/Task/Label.php
+++ b/CRM/Member/Form/Task/Label.php
@@ -111,23 +111,20 @@ class CRM_Member_Form_Task_Label extends CRM_Member_Form_Task {
       $individualFormat = TRUE;
     }
     // format the addresses according to CIVICRM_ADDRESS_FORMAT (CRM-1327)
-    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);
+    foreach ((array) $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['id'] = $id;
-        $formatted = CRM_Utils_Address::format($row, 'mailing_format', FALSE, TRUE, $individualFormat, $tokenFields);
-        $rows[$id] = array($formatted);
-      } 
+        $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);
     }
-
     if ($isPerMembership) {
       $labelRows = array();
       $memberships = civicrm_api3('membership', 'get', array(
-- 
2.25.1