Merge pull request #21147 from eileenmcnaughton/541

dev/core#2758 fix task tiles
civicrm · Aug 15, 2021 · 43da425 · 43da425
2 parents 867ceba + 95913c7
commit 43da425
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CRM/Core/Task.php b/CRM/Core/Task.php
@@ -47,7 +47,7 @@ abstract class CRM_Core_Task {
    *
    * @var array
    */
-  public static $_tasks = NULL;
+  public static $_tasks = [];
 
   /**
    * @var string

diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php
@@ -151,7 +151,7 @@ public static function taskTitles() {
    *   set of tasks that are valid for the user
    */
   public static function permissionedTaskTitles($permission, $params = []) {
-    $tasks = self::getTitlesFilteredByPermission(self::$_tasks, $permission === CRM_Core_Permission::EDIT);
+    $tasks = self::getTitlesFilteredByPermission(self::tasks(), $permission === CRM_Core_Permission::EDIT);
     return parent::corePermissionedTaskTitles($tasks, $permission, $params);
   }
 
@@ -165,8 +165,7 @@ public static function permissionedTaskTitles($permission, $params = []) {
    *   the set of tasks for a group of members
    */
   public static function getTask($value) {
-    self::tasks();
-    if (!$value || empty(self::$_tasks[$value])) {
+    if (!$value || empty(self::tasks()[$value])) {
       // Make the print task the default
       $value = self::TASK_PRINT;
     }