From 6c6901329fa61a1661922eec4579cfe1185d5814 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Mon, 19 May 2014 16:35:22 -0700
Subject: [PATCH] CRM-14367 - Fix fatal error due to 5.3 vs 5.4 php reqs, and
 tweak warning msg.

----------------------------------------
* CRM-14367:
  https://issues.civicrm.org/jira/browse/CRM-14367
---
 CRM/Contribute/Form/Task/PDFLetterCommon.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php
index 144b2a18e4..4b5ff64432 100644
--- a/CRM/Contribute/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php
@@ -70,7 +70,7 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
       if(empty($groupBy) || empty($contact['is_sent'][$groupBy][$groupByID])) {
         if(!$validated && $realSeparator == '</td><td>' && !self::isValidHTMLWithTableSeparator($messageToken, $html_message)) {
           $realSeparator = ', ';
-          CRM_Core_Session::setStatus(ts('You have selected the table cell separator but the token field is not inside a table cell. This would result in invalid html so comma separator has been used'));
+          CRM_Core_Session::setStatus(ts('You have selected the table cell separator, but one or more token fields are not placed inside a table cell. This would result in invalid HTML, so comma separators have been used instead.'));
         }
         $validated = TRUE;
         $html[$contributionId] = str_replace($separator, $realSeparator, self::resolveTokens($html_message, $contact, $contribution, $messageToken, $categories, $grouped, $separator));
@@ -167,8 +167,9 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
    */
   static function isHtmlTokenInTableCell($token, $entity, $textToSearch) {
     $tokenToMatch = $entity . '.' . $token;
-    $within = preg_match_all("|<td.+?{".$tokenToMatch."}.+?</td|si", $textToSearch);
-    $total = preg_match_all("|{".$tokenToMatch."}|", $textToSearch);
+    $dontCare = array();
+    $within = preg_match_all("|<td.+?{".$tokenToMatch."}.+?</td|si", $textToSearch, $dontCare);
+    $total = preg_match_all("|{".$tokenToMatch."}|", $textToSearch, $dontCare);
     return ($within == $total);
   }
 
-- 
2.25.1