Merge pull request #6382 from eileenmcnaughton/CRM-16923-tests

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

diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php
index d48f91d45c3b9ccaba86d2064881033457f1c8c4..c7f9b8256f448c4da1fc8a68e94c6b57806bf47f 100644 (file)
--- a/CRM/Contribute/Task.php
+++ b/CRM/Contribute/Task.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | 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$
  *
  */
@@ -45,7 +45,6 @@ class CRM_Contribute_Task {
    * The task array
    *
    * @var array
-   * @static
    */
   static $_tasks = NULL;
 
@@ -53,7 +52,6 @@ class CRM_Contribute_Task {
    * The optional task array
    *
    * @var array
-   * @static
    */
   static $_optionalTasks = NULL;
 
@@ -61,10 +59,10 @@ class CRM_Contribute_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
+   * @return array
+   *   the set of tasks for a group of contacts
    */
-  public static function &tasks() {
+  public static function tasks() {
     if (!(self::$_tasks)) {
       self::$_tasks = array(
         1 => array(
@@ -125,8 +123,8 @@ class CRM_Contribute_Task {
         unset(self::$_tasks[1]);
       }
       //CRM-12920 - check for edit permission
-      if( !CRM_Core_Permission::check('edit contributions') ){
-        unset(self::$_tasks[4],self::$_tasks[6]);
+      if (!CRM_Core_Permission::check('edit contributions')) {
+        unset(self::$_tasks[4], self::$_tasks[6]);
       }
 
       // remove action "Print or Email Contribution Invoices"
@@ -146,8 +144,8 @@ class CRM_Contribute_Task {
    * These tasks are the core set of task titles
    * on contributors
    *
-   * @return array the set of task titles
-   * @static
+   * @return array
+   *   the set of task titles
    */
   public static function &taskTitles() {
     self::tasks();
@@ -166,7 +164,8 @@ class CRM_Contribute_Task {
    *
    * @param bool $softCreditFiltering
    *
-   * @return array set of tasks that are valid for the user
+   * @return array
+   *   set of tasks that are valid for the user
    */
   public static function &permissionedTaskTitles($permission, $softCreditFiltering = FALSE) {
     $tasks = array();
@@ -199,8 +198,8 @@ class CRM_Contribute_Task {
    *
    * @param int $value
    *
-   * @return array the set of tasks for a group of contributors
-   * @static
+   * @return array
+   *   the set of tasks for a group of contributors
    */
   public static function getTask($value) {
     self::tasks();
@@ -218,4 +217,5 @@ class CRM_Contribute_Task {
       self::$_tasks[$value]['result'],
     );
   }
+
 }