From c855b6d083e54fc7ad6ec0348c3d0ad394981736 Mon Sep 17 00:00:00 2001
From: Marc Michalsky forumZFD <michalsky@forumzfd.de>
Date: Fri, 19 Feb 2021 16:13:00 +0100
Subject: [PATCH] code cleanup

---
 CRM/TwingleCampaign/BAO/TwingleCampaign.php  | 12 +++++++-----
 CRM/TwingleCampaign/Utils/ExtensionCache.php |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CRM/TwingleCampaign/BAO/TwingleCampaign.php b/CRM/TwingleCampaign/BAO/TwingleCampaign.php
index 77eb8fe..e9a7718 100644
--- a/CRM/TwingleCampaign/BAO/TwingleCampaign.php
+++ b/CRM/TwingleCampaign/BAO/TwingleCampaign.php
@@ -15,8 +15,6 @@ class CRM_TwingleCampaign_BAO_TwingleCampaign {
 
   private $id;
 
-  private $campaign_type_id;
-
   private $values;
 
 
@@ -79,7 +77,7 @@ class CRM_TwingleCampaign_BAO_TwingleCampaign {
    *
    * @throws CiviCRM_API3_Exception
    */
-  private function fetch() {
+  public function fetch() {
     $this->values = civicrm_api3('TwingleCampaign', 'getsingle',
       ['id' => $this->id])['values'];
   }
@@ -103,6 +101,11 @@ class CRM_TwingleCampaign_BAO_TwingleCampaign {
     // Determine the parent project id by looping through the campaign tree
     // until the parent campaign type is a TwingleProject
     $parent_id = $this->values['parent_id'];
+    $parent_id = $parent_id ?? civicrm_api3(
+      'TwingleCampaign',
+      'getsingle',
+        ['id' => $this->id]
+      )['values']['parent_id'];
 
     $parent_campaign_type_id = NULL;
 
@@ -288,8 +291,7 @@ class CRM_TwingleCampaign_BAO_TwingleCampaign {
    * ## Delete TwingleCampaign
    * Deletes this TwingleCampaign from CiviCRM
    */
-  private
-  function delete() {
+  public function delete() {
     if ($this->id) {
       try {
         civicrm_api3('Campaign', 'delete', ['id' => $this->id]);
diff --git a/CRM/TwingleCampaign/Utils/ExtensionCache.php b/CRM/TwingleCampaign/Utils/ExtensionCache.php
index f715fa1..1d3cf5c 100644
--- a/CRM/TwingleCampaign/Utils/ExtensionCache.php
+++ b/CRM/TwingleCampaign/Utils/ExtensionCache.php
@@ -7,7 +7,7 @@ use CRM_TwingleCampaign_ExtensionUtil as E;
 /**
  * A singleton that caches mappings and settings
  *
- * @package CRM\TwingleCampaign\Utilities
+ * @package CRM\TwingleCampaign\Utils
  */
 class CRM_TwingleCampaign_Utils_ExtensionCache {