Merge pull request #4892 from colemanw/INFRA-132

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

diff --git a/CRM/Mailing/Task.php b/CRM/Mailing/Task.php
index adf23d005d81046c9b3fbb75cd1668526528ee7d..1c60880a26cf4622fc58bce35ec61cc0b472d982 100644 (file)
--- a/CRM/Mailing/Task.php
+++ b/CRM/Mailing/Task.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -40,7 +40,7 @@
  */
 class CRM_Mailing_Task {
   /**
-   * the task array
+   * The task array
    *
    * @var array
    * @static
@@ -48,7 +48,7 @@ class CRM_Mailing_Task {
   static $_tasks = NULL;
 
   /**
-   * the optional task array
+   * The optional task array
    *
    * @var array
    * @static
@@ -61,9 +61,8 @@ class CRM_Mailing_Task {
    *
    * @return array the set of tasks for a group of contacts
    * @static
-   * @access public
    */
-  static function &tasks() {
+  public static function &tasks() {
     if (!(self::$_tasks)) {
       self::$_tasks = array(
         1 => array(
@@ -86,22 +85,20 @@ class CRM_Mailing_Task {
    *
    * @return array the set of task titles
    * @static
-   * @access public
    */
-  static function &taskTitles() {
+  public static function &taskTitles() {
     return array();
   }
 
   /**
-   * show tasks selectively based on the permission level
+   * Show tasks selectively based on the permission level
    * of the user
    *
    * @param int $permission
    *
    * @return array set of tasks that are valid for the user
-   * @access public
    */
-  static function &permissionedTaskTitles($permission) {
+  public static function &permissionedTaskTitles($permission) {
     $task = array();
     return $task;
   }
@@ -114,9 +111,8 @@ class CRM_Mailing_Task {
    *
    * @return array the set of tasks for a group of mailing recipients
    * @static
-   * @access public
    */
-  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