From 6cedc657791774c45da6f239ad0344d3cc58355b Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Mon, 25 Oct 2021 12:01:41 +0530 Subject: [PATCH] Fix fatal error in joomla with civicrm task query param --- CRM/Contribute/Task.php | 4 ++-- CRM/Core/Controller/Task.php | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php index b95755c481..9f54f2258d 100644 --- a/CRM/Contribute/Task.php +++ b/CRM/Contribute/Task.php @@ -91,7 +91,7 @@ class CRM_Contribute_Task extends CRM_Core_Task { 'result' => FALSE, 'title_single_mode' => ts('Send Receipt'), 'name' => ts('Send Receipt'), - 'url' => 'civicrm/contribute/task?reset=1&task=receipt', + 'url' => 'civicrm/contribute/task?reset=1&task_item=receipt', 'key' => 'receipt', 'icon' => 'fa-envelope-o', 'filters' => ['contribution_status_id' => [CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed')]], @@ -101,7 +101,7 @@ class CRM_Contribute_Task extends CRM_Core_Task { 'title' => ts('Thank-you letters - print or email'), 'class' => 'CRM_Contribute_Form_Task_PDFLetter', 'result' => FALSE, - 'url' => 'civicrm/contribute/task?reset=1&task=letter', + 'url' => 'civicrm/contribute/task?reset=1&task_item=letter', 'key' => 'letter', 'name' => ts('Send Letter'), 'is_single_mode' => TRUE, diff --git a/CRM/Core/Controller/Task.php b/CRM/Core/Controller/Task.php index 5af9740b65..02674c6a40 100644 --- a/CRM/Core/Controller/Task.php +++ b/CRM/Core/Controller/Task.php @@ -72,7 +72,10 @@ abstract class CRM_Core_Controller_Task extends CRM_Core_Controller { * @throws \CRM_Core_Exception */ protected function getTaskClass(): array { - $task = CRM_Utils_Request::retrieve('task', 'Alphanumeric', $this, TRUE); + $task = CRM_Utils_Request::retrieve('task_item', 'Alphanumeric', $this); + if (empty($task)) { + $task = CRM_Utils_Request::retrieve('task', 'Alphanumeric', $this, TRUE); + } foreach ($this->getAvailableTasks() as $taskAction) { if (($taskAction['key'] ?? '') === $task) { return (array) $taskAction['class']; -- 2.25.1