diff --git a/CRM/Activity/Task.php b/CRM/Activity/Task.php index 1f116a390bd..dbb2e6307d3 100644 --- a/CRM/Activity/Task.php +++ b/CRM/Activity/Task.php @@ -134,9 +134,11 @@ public static function &tasks() { if (!CRM_Core_Permission::check('delete activities')) { unset(self::$_tasks[1]); } + + CRM_Utils_Hook::searchTasks('activity', self::$_tasks); + asort(self::$_tasks); } - CRM_Utils_Hook::searchTasks('activity', self::$_tasks); - asort(self::$_tasks); + return self::$_tasks; } diff --git a/CRM/Campaign/Task.php b/CRM/Campaign/Task.php index 95c2b3ef0ba..2b12d19e004 100644 --- a/CRM/Campaign/Task.php +++ b/CRM/Campaign/Task.php @@ -91,11 +91,10 @@ public static function &tasks() { 'result' => FALSE, ), ); - } - - CRM_Utils_Hook::searchTasks('campaign', self::$_tasks); - asort(self::$_tasks); + CRM_Utils_Hook::searchTasks('campaign', self::$_tasks); + asort(self::$_tasks); + } return self::$_tasks; } diff --git a/CRM/Case/Task.php b/CRM/Case/Task.php index 9cc1c4a2811..5af2aaaf1c9 100644 --- a/CRM/Case/Task.php +++ b/CRM/Case/Task.php @@ -92,14 +92,16 @@ public static function &tasks() { 'result' => FALSE, ), ); + //CRM-4418, check for delete if (!CRM_Core_Permission::check('delete in CiviCase')) { unset(self::$_tasks[1]); } + + CRM_Utils_Hook::searchTasks('case', self::$_tasks); + asort(self::$_tasks); } - CRM_Utils_Hook::searchTasks('case', self::$_tasks); - asort(self::$_tasks); return self::$_tasks; } diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php index 47432739329..9c4f20c5ad5 100644 --- a/CRM/Contribute/Task.php +++ b/CRM/Contribute/Task.php @@ -131,6 +131,7 @@ public static function tasks() { if (!$invoicing) { unset(self::$_tasks[9]); } + CRM_Utils_Hook::searchTasks('contribution', self::$_tasks); asort(self::$_tasks); } diff --git a/CRM/Event/Task.php b/CRM/Event/Task.php index 28f257e4a51..4bc04bf7bd5 100644 --- a/CRM/Event/Task.php +++ b/CRM/Event/Task.php @@ -145,9 +145,9 @@ public static function &tasks() { if (!CRM_Core_Permission::check('edit event participants')) { unset(self::$_tasks[4], self::$_tasks[5], self::$_tasks[15]); } - } - CRM_Utils_Hook::searchTasks('event', self::$_tasks); + CRM_Utils_Hook::searchTasks('event', self::$_tasks); + } return self::$_tasks; } diff --git a/CRM/Grant/Task.php b/CRM/Grant/Task.php index 30beb3cd584..290f52ab78f 100644 --- a/CRM/Grant/Task.php +++ b/CRM/Grant/Task.php @@ -89,12 +89,15 @@ public static function &tasks() { 'result' => FALSE, ), ); + + if (!CRM_Core_Permission::check('delete in CiviGrant')) { + unset(self::$_tasks[1]); + } + + CRM_Utils_Hook::searchTasks('grant', self::$_tasks); + asort(self::$_tasks); } - if (!CRM_Core_Permission::check('delete in CiviGrant')) { - unset(self::$_tasks[1]); - } - CRM_Utils_Hook::searchTasks('grant', self::$_tasks); - asort(self::$_tasks); + return self::$_tasks; } diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php index df91d1b0eb6..7f2da7b08e7 100644 --- a/CRM/Member/Task.php +++ b/CRM/Member/Task.php @@ -119,9 +119,11 @@ public static function &tasks() { if (!CRM_Core_Permission::check('edit memberships')) { unset(self::$_tasks[5]); } + + CRM_Utils_Hook::searchTasks('membership', self::$_tasks); + asort(self::$_tasks); } - CRM_Utils_Hook::searchTasks('membership', self::$_tasks); - asort(self::$_tasks); + return self::$_tasks; } diff --git a/CRM/Pledge/Task.php b/CRM/Pledge/Task.php index b4b7ec5e13d..feeaf107344 100644 --- a/CRM/Pledge/Task.php +++ b/CRM/Pledge/Task.php @@ -85,9 +85,11 @@ public static function &tasks() { if (!CRM_Core_Permission::check('delete in CiviPledge')) { unset(self::$_tasks[1]); } + + CRM_Utils_Hook::searchTasks('pledge', self::$_tasks); + asort(self::$_tasks); } - CRM_Utils_Hook::searchTasks('pledge', self::$_tasks); - asort(self::$_tasks); + return self::$_tasks; }