CRM-16666 - Custom participant statuses do not print in email confirmation

[civicrm-core.git] / CRM / Mailing / Task.php

diff --git a/CRM/Mailing/Task.php b/CRM/Mailing/Task.php
index d48267554ae6e71a6e0bb576e3b32c45a096a27d..1f80c156a9b61c1a49f5f138c749e5f5e917096f 100644 (file)
--- a/CRM/Mailing/Task.php
+++ b/CRM/Mailing/Task.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -43,7 +43,6 @@ class CRM_Mailing_Task {
    * The task array
    *
    * @var array
-   * @static
    */
   static $_tasks = NULL;
 
@@ -51,7 +50,6 @@ class CRM_Mailing_Task {
    * The optional task array
    *
    * @var array
-   * @static
    */
   static $_optionalTasks = NULL;
 
@@ -59,11 +57,10 @@ class CRM_Mailing_Task {
    * These tasks are the core set of tasks that the user can perform
    * on a contact / group of contacts
    *
-   * @return array the set of tasks for a group of contacts
-   * @static
-   * @access public
+   * @return array
+   *   the set of tasks for a group of contacts
    */
-  static function &tasks() {
+  public static function &tasks() {
     if (!(self::$_tasks)) {
       self::$_tasks = array(
         1 => array(
@@ -84,11 +81,10 @@ class CRM_Mailing_Task {
    * These tasks are the core set of task titles
    * on mailing recipients
    *
-   * @return array the set of task titles
-   * @static
-   * @access public
+   * @return array
+   *   the set of task titles
    */
-  static function &taskTitles() {
+  public static function &taskTitles() {
     return array();
   }
 
@@ -98,25 +94,24 @@ class CRM_Mailing_Task {
    *
    * @param int $permission
    *
-   * @return array set of tasks that are valid for the user
-   * @access public
+   * @return array
+   *   set of tasks that are valid for the user
    */
-  static function &permissionedTaskTitles($permission) {
+  public static function &permissionedTaskTitles($permission) {
     $task = array();
     return $task;
   }
 
   /**
-   * These tasks are the core set of tasks that the user can perform
+   * These tasks are the core set of tasks that the user can perform.
    * on mailing recipients
    *
    * @param int $value
    *
-   * @return array the set of tasks for a group of mailing recipients
-   * @static
-   * @access public
+   * @return array
+   *   the set of tasks for a group of mailing recipients
    */
-  static function getTask($value) {
+  public static function getTask($value) {
     self::tasks();
     if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
       // make the print task by default
@@ -127,4 +122,5 @@ class CRM_Mailing_Task {
       self::$_tasks[$value]['result'],
     );
   }
+
 }