Merge pull request #9637 from omarabuhussein/CRM-19832-searchtask-hook

CRM-19832: Ensure that searchTasks hook get invoked once
civicrm · Jan 11, 2017 · 1158b3d · 1158b3d
2 parents f044c46 + 4d73a5a
commit 1158b3d
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
   }