CiviCRM no longer tabe $_tableName property (#608)

civicrm · Aug 27, 2024 · 3e95676 · 3e95676
1 parent 88d4756
commit 3e95676
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/CRM/Volunteer/Angular/Tab/Event.php b/CRM/Volunteer/Angular/Tab/Event.php
@@ -14,7 +14,7 @@ protected static function initializeProject($eventId) {
     $project = new CRM_Volunteer_BAO_Project();
     $project->id = 0;
     $project->entity_id = $eventId;
-    $project->entity_table = CRM_Event_DAO_Event::$_tableName;
+    $project->entity_table = CRM_Event_DAO_Event::getTableName();
 
     return $project;
   }
@@ -33,7 +33,7 @@ public static function prepareTab($eventId) {
 
     $project = current(CRM_Volunteer_BAO_Project::retrieve(array(
           'entity_id' => $eventId,
-          'entity_table' => CRM_Event_DAO_Event::$_tableName,
+          'entity_table' => CRM_Event_DAO_Event::getTableName(),
     )));
     if (!$project) {
       $project = self::initializeProject($eventId);

diff --git a/CRM/Volunteer/BAO/Assignment.php b/CRM/Volunteer/BAO/Assignment.php
@@ -115,19 +115,19 @@ public static function retrieve(array $params) {
       if (CRM_Utils_Array::value($key, $activity_fields)) {
         $dataType = CRM_Utils_Type::typeToString($activity_fields[$key]['type']);
         $fieldName = $activity_fields[$key]['name'];
-        $tableName = CRM_Activity_DAO_Activity::$_tableName;
+        $tableName = CRM_Activity_DAO_Activity::getTableName();
       } elseif (CRM_Utils_Array::value($key, $contact_fields)) {
         $dataType = CRM_Utils_Type::typeToString($contact_fields[$key]['type']);
         $fieldName = $contact_fields[$key]['name'];
-        $tableName = CRM_Contact_DAO_Contact::$_tableName;
+        $tableName = CRM_Contact_DAO_Contact::getTableName();
       } elseif (CRM_Utils_Array::value($key, $custom_fields)) {
         $dataType = $custom_fields[$key]['data_type'];
         $fieldName = $custom_fields[$key]['column_name'];
         $tableName = $customTableName;
       } elseif($key == 'project_id') {
         $dataType = 'Int';
         $fieldName = 'id';
-        $tableName = CRM_Volunteer_DAO_Project::$_tableName;
+        $tableName = CRM_Volunteer_DAO_Project::getTableName();
       } elseif ($key == 'target_contact_id') {
         $dataType = 'Int';
         $fieldName = 'contact_id';

diff --git a/CRM/Volunteer/BAO/Commendation.php b/CRM/Volunteer/BAO/Commendation.php
@@ -134,11 +134,11 @@ public static function retrieve(array $params) {
       if (CRM_Utils_Array::value($key, $activity_fields)) {
         $dataType = CRM_Utils_Type::typeToString($activity_fields[$key]['type']);
         $fieldName = $activity_fields[$key]['name'];
-        $tableName = CRM_Activity_DAO_Activity::$_tableName;
+        $tableName = CRM_Activity_DAO_Activity::getTableName();
       } elseif (CRM_Utils_Array::value($key, $contact_fields)) {
         $dataType = CRM_Utils_Type::typeToString($contact_fields[$key]['type']);
         $fieldName = $contact_fields[$key]['name'];
-        $tableName = CRM_Contact_DAO_Contact::$_tableName;
+        $tableName = CRM_Contact_DAO_Contact::getTableName();
       } elseif (CRM_Utils_Array::value($key, $custom_fields)) {
         $dataType = $custom_fields[$key]['data_type'];
         $fieldName = $custom_fields[$key]['column_name'];
@@ -183,4 +183,4 @@ public static function retrieve(array $params) {
 
     return $rows;
   }
-}
+}
diff --git a/volunteer.php b/volunteer.php
@@ -154,7 +154,7 @@ function volunteer_civicrm_tabset($tabsetName, &$tabs, $context) {
         'current' => false,
       );
 
-      if (!CRM_Volunteer_BAO_Project::isActive($eventId, CRM_Event_DAO_Event::$_tableName)) {
+      if (!CRM_Volunteer_BAO_Project::isActive($eventId, CRM_Event_DAO_Event::getTableName())) {
         $tab['volunteer']['valid'] = FALSE;
       }
     }
@@ -175,7 +175,7 @@ function volunteer_civicrm_tabset($tabsetName, &$tabs, $context) {
 
   // on manage events listing screen, this section sets volunteer tab in configuration popup as enabled/disabled.
   if ($tabsetName == 'civicrm/event/manage/rows' && $eventId) {
-    $tabs[$eventId]['is_volunteer'] = CRM_Volunteer_BAO_Project::isActive($eventId, CRM_Event_DAO_Event::$_tableName);
+    $tabs[$eventId]['is_volunteer'] = CRM_Volunteer_BAO_Project::isActive($eventId, CRM_Event_DAO_Event::getTableName());
   }
 }