Merge pull request #2490 from colemanw/4.4

CRM-10466 - Ensure token hooks are always called

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,