Merge pull request #26025 from colemanw/removeDeprecatedClasses

Remove old deprecated class aliases
civicrm · Apr 10, 2023 · 4ec78c8 · 4ec78c8
2 parents 24cff36 + f687b5a
commit 4ec78c8
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 100 deletions.
diff --git a/CRM/ACL/BAO/EntityRole.php b/CRM/ACL/BAO/EntityRole.php
diff --git a/CRM/Dedupe/BAO/Exception.php b/CRM/Dedupe/BAO/Exception.php
diff --git a/CRM/Dedupe/BAO/Rule.php b/CRM/Dedupe/BAO/Rule.php
diff --git a/CRM/Dedupe/BAO/RuleGroup.php b/CRM/Dedupe/BAO/RuleGroup.php
diff --git a/CRM/Mailing/BAO/Component.php b/CRM/Mailing/BAO/Component.php
diff --git a/ext/flexmailer/src/Event/CheckSendableEvent.php b/ext/flexmailer/src/Event/CheckSendableEvent.php
@@ -76,8 +76,8 @@ public function getFullBody($field) {
       throw new \RuntimeException("getFullBody() only supports body_text and body_html");
     }
     $mailing = $this->getMailing();
-    $header = $mailing->header_id && $mailing->header_id != 'null' ? \CRM_Mailing_BAO_Component::findById($mailing->header_id) : NULL;
-    $footer = $mailing->footer_id && $mailing->footer_id != 'null' ? \CRM_Mailing_BAO_Component::findById($mailing->footer_id) : NULL;
+    $header = $mailing->header_id && $mailing->header_id != 'null' ? \CRM_Mailing_BAO_MailingComponent::findById($mailing->header_id) : NULL;
+    $footer = $mailing->footer_id && $mailing->footer_id != 'null' ? \CRM_Mailing_BAO_MailingComponent::findById($mailing->footer_id) : NULL;
     if (empty($mailing->{$field})) {
       return NULL;
     }