From ff926d67c93d6058a3f3e2f857f8852ef904788d Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Fri, 2 May 2014 21:27:33 -0700
Subject: [PATCH] CRM-14367 remove unused  & try catch in favour of hard fail
 (can't think of any cases where soft fail is good

---
 CRM/Contribute/Form/Task/PDFLetterCommon.php | 75 +++++++++-----------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php
index 73e5131b4f..a020f1bb8a 100644
--- a/CRM/Contribute/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php
@@ -52,7 +52,7 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
     $skipOnHold = isset($form->skipOnHold) ? $form->skipOnHold : FALSE;
     $skipDeceased = isset($form->skipDeceased) ? $form->skipDeceased : TRUE;
 
-    list($notSent, $contributions, $contacts) = self::buildContributionArray($groupBy, $form, $returnProperties, $skipOnHold, $skipDeceased, $messageToken, $task, $separator);
+    list($contributions, $contacts) = self::buildContributionArray($groupBy, $form, $returnProperties, $skipOnHold, $skipDeceased, $messageToken, $task, $separator);
     $html = array();
     foreach ($contributions as $contributionId => $contribution) {
       $contact = &$contacts[$contribution['contact_id']];
@@ -223,55 +223,50 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
       $contributionIDs = $form->getVar('_contributionContactIds');
     }
     foreach ($contributionIDs as $item => $contributionId) {
-      try {
-        // get contribution information
-        $contribution = CRM_Utils_Token::getContributionTokenDetails(array('contribution_id' => $contributionId),
+      // get contribution information
+      $contribution = CRM_Utils_Token::getContributionTokenDetails(array('contribution_id' => $contributionId),
+        $returnProperties,
+        NULL,
+        $messageToken,
+        $task
+      );
+      $contribution = $contributions[$contributionId] = $contribution[$contributionId];
+      if ($form->_includesSoftCredits) {
+        //@todo find out why this happens & add comments
+        list($contactID) = explode('-', $item);
+        $contactID = (int) $contactID;
+       }
+      else {
+         $contactID = $contribution['contact_id'];
+      }
+      if(!isset($contacts[$contactID])) {
+        list($contact) = CRM_Utils_Token::getTokenDetails(array('contact_id' => $contactID),
           $returnProperties,
+          $skipOnHold,
+          $skipDeceased,
           NULL,
           $messageToken,
           $task
         );
-        $contribution = $contributions[$contributionId] = $contribution[$contributionId];
-        if ($form->_includesSoftCredits) {
-          //@todo find out why this happens & add comments
-          list($contactID) = explode('-', $item);
-          $contactID = (int) $contactID;
-         }
-        else {
-           $contactID = $contribution['contact_id'];
-        }
-        if(!isset($contacts[$contactID])) {
-          list($contact) = CRM_Utils_Token::getTokenDetails(array('contact_id' => $contactID),
-            $returnProperties,
-            $skipOnHold,
-            $skipDeceased,
-            NULL,
-            $messageToken,
-            $task
-          );
-          $contacts[$contactID] = $contact[$contactID];
-          $contacts[$contactID]['contact_aggregate'] = 0;
-          $contacts[$contactID]['combined'] = $contacts[$contactID]['contribution_ids'] = array();
-        }
+        $contacts[$contactID] = $contact[$contactID];
+        $contacts[$contactID]['contact_aggregate'] = 0;
+        $contacts[$contactID]['combined'] = $contacts[$contactID]['contribution_ids'] = array();
+      }
 
-        $contacts[$contactID]['contact_aggregate'] += $contribution['total_amount'];
-        $groupByID = empty($contribution[$groupBy]) ? 0 : $contribution[$groupBy];
+      $contacts[$contactID]['contact_aggregate'] += $contribution['total_amount'];
+      $groupByID = empty($contribution[$groupBy]) ? 0 : $contribution[$groupBy];
 
-        $contacts[$contactID]['contribution_ids'][$groupBy][$groupByID][$contributionId] = TRUE;
-        if(!isset($contacts[$contactID]['combined'][$groupBy]) || !isset($contacts[$contactID]['combined'][$groupBy][$groupByID])) {
-          $contacts[$contactID]['combined'][$groupBy][$groupByID] = $contribution;
-          $contacts[$contactID]['aggregates'][$groupBy][$groupByID] = $contribution['total_amount'];
-        }
-        else {
-          $contacts[$contactID]['combined'][$groupBy][$groupByID] = self::combineContributions($contacts[$contactID]['combined'][$groupBy][$groupByID], $contribution, $separator);
-          $contacts[$contactID]['aggregates'][$groupBy][$groupByID] += $contribution['total_amount'];
-        }
+      $contacts[$contactID]['contribution_ids'][$groupBy][$groupByID][$contributionId] = TRUE;
+      if(!isset($contacts[$contactID]['combined'][$groupBy]) || !isset($contacts[$contactID]['combined'][$groupBy][$groupByID])) {
+        $contacts[$contactID]['combined'][$groupBy][$groupByID] = $contribution;
+        $contacts[$contactID]['aggregates'][$groupBy][$groupByID] = $contribution['total_amount'];
       }
-      catch(Exception $e) {
-        $notSent[] = $contributionId;
+      else {
+        $contacts[$contactID]['combined'][$groupBy][$groupByID] = self::combineContributions($contacts[$contactID]['combined'][$groupBy][$groupByID], $contribution, $separator);
+        $contacts[$contactID]['aggregates'][$groupBy][$groupByID] += $contribution['total_amount'];
       }
     }
-    return array($notSent, $contributions, $contacts);
+    return array($contributions, $contacts);
   }
 
   /**
-- 
2.25.1