From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 7 Feb 2014 01:14:23 +0000 (-0800)
Subject: CRM-10466 - Ensure token hooks are always called
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=db969160c3283fe4517dd41e4fb5f39685a0eb6f;p=civicrm-core.git

CRM-10466 - Ensure token hooks are always called
---

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 8cb0c29c59..a6694c30e3 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -1245,7 +1245,7 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
 
     // get token details for contacts, call only if tokens are used
     $details = array();
-    if (!empty($allTokens)) {
+    if (!empty($returnProperties) || !empty($tokens) || !empty($allTokens)) {
       list($details) = CRM_Utils_Token::getTokenDetails(
         $contactIds,
         $returnProperties,