From d774343ede4b5be99a711b8e0ee7413e31c87154 Mon Sep 17 00:00:00 2001
From: "Matthew Wire (MJW Consulting)" <mjw@mjwconsult.co.uk>
Date: Tue, 4 Sep 2018 16:15:01 +0100
Subject: [PATCH] Rename  to  as it is used by activities and events

---
 CRM/Core/Page/RecurringEntityPreview.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CRM/Core/Page/RecurringEntityPreview.php b/CRM/Core/Page/RecurringEntityPreview.php
index 07935f9810..2cd57b6d27 100644
--- a/CRM/Core/Page/RecurringEntityPreview.php
+++ b/CRM/Core/Page/RecurringEntityPreview.php
@@ -36,7 +36,7 @@ class CRM_Core_Page_RecurringEntityPreview extends CRM_Core_Page {
    * Run the basic page (run essentially starts execution for that page).
    */
   public function run() {
-    $parentEventId = $startDate = $endDate = NULL;
+    $parentEntityId = $startDate = $endDate = NULL;
     $dates = $original = array();
     $formValues = $_REQUEST;
     if (!empty($formValues['entity_table'])) {
@@ -56,15 +56,15 @@ class CRM_Core_Page_RecurringEntityPreview extends CRM_Core_Page {
       }
 
       if (!empty($formValues['entity_id'])) {
-        $parentEventId = CRM_Core_BAO_RecurringEntity::getParentFor($formValues['entity_id'], $formValues['entity_table']);
+        $parentEntityId = CRM_Core_BAO_RecurringEntity::getParentFor($formValues['entity_id'], $formValues['entity_table']);
       }
 
       // Get original entity
       $original[$startDateColumnName] = CRM_Utils_Date::processDate($formValues['repetition_start_date']);
       $daoName = CRM_Core_BAO_RecurringEntity::$_tableDAOMapper[$formValues['entity_table']];
-      if ($parentEventId) {
-        $startDate = $original[$startDateColumnName] = CRM_Core_DAO::getFieldValue($daoName, $parentEventId, $startDateColumnName);
-        $endDate = $original[$startDateColumnName] = $endDateColumnName ? CRM_Core_DAO::getFieldValue($daoName, $parentEventId, $endDateColumnName) : NULL;
+      if ($parentEntityId) {
+        $startDate = $original[$startDateColumnName] = CRM_Core_DAO::getFieldValue($daoName, $parentEntityId, $startDateColumnName);
+        $endDate = $original[$startDateColumnName] = $endDateColumnName ? CRM_Core_DAO::getFieldValue($daoName, $parentEntityId, $endDateColumnName) : NULL;
       }
 
       //Check if there is any enddate column defined to find out the interval between the two range
@@ -88,8 +88,8 @@ class CRM_Core_Page_RecurringEntityPreview extends CRM_Core_Page {
       }
 
       //Show the list of participants registered for the events if any
-      if ($formValues['entity_table'] == "civicrm_event" && !empty($parentEventId)) {
-        $getConnectedEntities = CRM_Core_BAO_RecurringEntity::getEntitiesForParent($parentEventId, 'civicrm_event', TRUE);
+      if ($formValues['entity_table'] == "civicrm_event" && !empty($parentEntityId)) {
+        $getConnectedEntities = CRM_Core_BAO_RecurringEntity::getEntitiesForParent($parentEntityId, 'civicrm_event', TRUE);
         if ($getConnectedEntities) {
           $participantDetails = CRM_Event_Form_ManageEvent_Repeat::getParticipantCountforEvent($getConnectedEntities);
           if (!empty($participantDetails['countByName'])) {
-- 
2.25.1