Merge pull request #17221 from civicrm/5.25

[civicrm-core.git] / CRM / Contribute / Task.php

diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php
index 144768eab72b7b6fb5d3b0f84dd3b8ae926f4b24..0acabfa405cc8381d6906bc05c4d22fd4c579ab0 100644 (file)
--- a/CRM/Contribute/Task.php
+++ b/CRM/Contribute/Task.php
@@ -112,8 +112,7 @@ class CRM_Contribute_Task extends CRM_Core_Task {
       }
 
       // remove action "Invoices - print or email"
-      $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-      $invoicing = $invoiceSettings['invoicing'] ?? NULL;
+      $invoicing = CRM_Invoicing_Utils::isInvoicingEnabled();
       if (!$invoicing) {
         unset(self::$_tasks[self::PDF_INVOICE]);
       }