CRM-16737 spport either payment_status_id OR contribution_status_id as processor...

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

diff --git a/CRM/Activity/Task.php b/CRM/Activity/Task.php
index 24c782772333b48ab9af551e3e9214ba19b572ed..1a07d53b155a509a41988ca1286189425136a688 100644 (file)
--- a/CRM/Activity/Task.php
+++ b/CRM/Activity/Task.php
@@ -3,13 +3,13 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
  | CiviCRM is free software; you can copy, modify, and distribute it  |
  | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007.                                       |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
  |                                                                    |
  | CiviCRM is distributed in the hope that it will be useful, but     |
  | WITHOUT ANY WARRANTY; without even the implied warranty of         |
@@ -17,7 +17,8 @@
  | See the GNU Affero General Public License for more details.        |
  |                                                                    |
  | You should have received a copy of the GNU Affero General Public   |
- | License along with this program; if not, contact CiviCRM LLC       |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
  | at info[AT]civicrm[DOT]org. If you have questions about the        |
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
@@ -27,15 +28,13 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
- *
  */
 
 /**
- * class to represent the actions that can be performed on a group of contacts
- * used by the search forms
- *
+ * Class to represent the actions that can be performed on a group of contacts
+ * used by the search forms.
  */
 class CRM_Activity_Task {
   const
@@ -47,21 +46,21 @@ class CRM_Activity_Task {
     EMAIL_SMS = 6;
 
   /**
-   * The task array
+   * The task array.
    *
    * @var array
    */
   static $_tasks = NULL;
 
   /**
-   * The optional task array
+   * The optional task array.
    *
    * @var array
    */
   static $_optionalTasks = NULL;
 
   /**
-   * 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 a contact / group of contacts
    *
    * @return array
@@ -145,7 +144,7 @@ class CRM_Activity_Task {
   }
 
   /**
-   * These tasks are the core set of task titles
+   * These tasks are the core set of task titles.
    * on activity
    *
    * @return array
@@ -161,7 +160,7 @@ class CRM_Activity_Task {
   }
 
   /**
-   * Show tasks selectively based on the permission level
+   * Show tasks selectively based on the permission level.
    * of the user
    *
    * @param int $permission
@@ -188,7 +187,7 @@ class CRM_Activity_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 activity
    *
    * @param int $value