X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FTask.php;h=51e67c8346621eaae772f16ac44f1d74cba4bc03;hb=7ab8180f06f834b292b7e9a0bd188c22fce6092c;hp=96a64e8a56e3595b199718d3f6b82036afda1973;hpb=fdf3bd7950966f84c34888296680b6d00bbbcc53;p=civicrm-core.git

diff --git a/CRM/Core/Task.php b/CRM/Core/Task.php
index 96a64e8a56..51e67c8346 100644
--- a/CRM/Core/Task.php
+++ b/CRM/Core/Task.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -27,7 +27,7 @@
 
 /**
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  */
 
 /**
@@ -82,7 +82,7 @@ abstract class CRM_Core_Task {
    *            ]
    */
   public static function tasks() {
-    CRM_Utils_Hook::searchTasks(self::$objectType, self::$_tasks);
+    CRM_Utils_Hook::searchTasks(static::$objectType, self::$_tasks);
     asort(self::$_tasks);
 
     return self::$_tasks;
@@ -120,7 +120,7 @@ abstract class CRM_Core_Task {
   /**
    * Show tasks selectively based on the permission level
    * of the user
-   * This function should be call parent::corePermissionedTaskTitles
+   * This function should be overridden by the child class which would normally call parent::corePermissionedTaskTitles
    *
    * @param int $permission
    * @param array $params
@@ -129,7 +129,9 @@ abstract class CRM_Core_Task {
    * @return array
    *   set of tasks that are valid for the user
    */
-  abstract public static function permissionedTaskTitles($permission, $params);
+  public static function permissionedTaskTitles($permission, $params) {
+    return self::corePermissionedTaskTitles(self::tasks(), $permission, $params);
+  }
 
   /**
    * Show tasks selectively based on the permission level
@@ -170,8 +172,8 @@ abstract class CRM_Core_Task {
     static::tasks();
 
     if (!CRM_Utils_Array::value($value, self::$_tasks)) {
-      // Children can specify a default task (eg. print), we don't here
-      return array();
+      // Children can specify a default task (eg. print), pick another if it is not valid.
+      $value = key(self::$_tasks);
     }
     return array(
       CRM_Utils_Array::value('class', self::$_tasks[$value]),