Merge pull request #17340 from demeritcowboy/not-yet-deprecated

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

diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php
index 12c097c0e51b7fd522612e92412724526330d77a..9a88cfc6d51ad802e97268955d6a8e6e82d02a0b 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 = CRM_Utils_Array::value('invoicing', $invoiceSettings);
+      $invoicing = CRM_Invoicing_Utils::isInvoicingEnabled();
       if (!$invoicing) {
         unset(self::$_tasks[self::PDF_INVOICE]);
       }
@@ -176,7 +175,7 @@ class CRM_Contribute_Task extends CRM_Core_Task {
    */
   public static function getTask($value) {
     self::tasks();
-    if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
+    if (!$value || empty(self::$_tasks[$value])) {
       // make the print task by default
       $value = self::TASK_PRINT;
     }