From: Jon goldberg <jon@palantetech.coop>
Date: Sat, 5 Mar 2016 00:35:58 +0000 (-0500)
Subject: CRM-18164 - Fix display of activities when recurring activity is present
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=053eb755fa698354dada23ddb224814a08b79cc9;p=civicrm-core.git

CRM-18164 - Fix display of activities when recurring activity is present
---

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index f5a5a0ac46..9149a36ab7 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -2604,7 +2604,7 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.n
         );
 
         if ($values['is_recurring_activity']) {
-          $contactActivities[$activityId]['is_recurring_activity'] = CRM_Core_BAO_RecurringEntity::getPositionAndCount($values['activity_id'], 'civicrm_activity');
+          $activity['is_recurring_activity'] = CRM_Core_BAO_RecurringEntity::getPositionAndCount($values['activity_id'], 'civicrm_activity');
         }
 
         array_push($contactActivities, $activity);