CRM-19832: Backporting #9637 to 4.6

diff --git a/CRM/Activity/Task.php b/CRM/Activity/Task.php
index 1a07d53b155a509a41988ca1286189425136a688..1a4e20ffc7aba7c469fe97a2207e1863097e7c30 100644 (file)
--- a/CRM/Activity/Task.php
+++ b/CRM/Activity/Task.php
@@ -137,9 +137,11 @@ class CRM_Activity_Task {
       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 033772253c905961e6b688e4e77d5f3fb492f32c..642577c609be42a7838baace56a3fe69ac649597 100755 (executable)
--- a/CRM/Campaign/Task.php
+++ b/CRM/Campaign/Task.php
@@ -94,11 +94,10 @@ class CRM_Campaign_Task {
           '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 0b6205fd43be148afd2606b0473762b7649002bc..7cd4726483fdf127bc9ca503001a766c9c064785 100644 (file)
--- a/CRM/Case/Task.php
+++ b/CRM/Case/Task.php
@@ -93,10 +93,11 @@ class CRM_Case_Task {
       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 d4d095a46d8c305738492170eb168306dbbbdf6e..b4c6a5dcdf451bbf43162e450512dffb2aef9b61 100644 (file)
--- a/CRM/Contribute/Task.php
+++ b/CRM/Contribute/Task.php
@@ -133,6 +133,7 @@ class CRM_Contribute_Task {
       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 fcf13dd9173fe3159f022756cc38a8a333a9f406..8df11e500d8f80faaf1515b055adccd3507412bc 100644 (file)
--- a/CRM/Event/Task.php
+++ b/CRM/Event/Task.php
@@ -140,10 +140,11 @@ class CRM_Event_Task {
       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);
+      asort(self::$_tasks);
     }
 
-    CRM_Utils_Hook::searchTasks('event', self::$_tasks);
-    asort(self::$_tasks);
     return self::$_tasks;
   }
 

diff --git a/CRM/Grant/Task.php b/CRM/Grant/Task.php
index c08bc27714abea1f127d21ec1b4dda1961aba498..8b3d72660410055ecc5d848a5c292b9802ad4a78 100644 (file)
--- a/CRM/Grant/Task.php
+++ b/CRM/Grant/Task.php
@@ -89,12 +89,15 @@ class CRM_Grant_Task {
           '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 19bc954e984f9480896a203bec37af38ba9e8992..f9321ddf77dad809a7183590aa89d8ab2aab1c52 100644 (file)
--- a/CRM/Member/Task.php
+++ b/CRM/Member/Task.php
@@ -119,9 +119,11 @@ class CRM_Member_Task {
       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 4d166216892465bb60d3ae3b9c8ebe7dd88632b4..75330fd0cf161bcc78c2f0cdbb9e73f023441bc5 100644 (file)
--- a/CRM/Pledge/Task.php
+++ b/CRM/Pledge/Task.php
@@ -89,9 +89,11 @@ class CRM_Pledge_Task {
       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;
   }