X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCampaign%2FTask.php;h=033772253c905961e6b688e4e77d5f3fb492f32c;hb=c3d2bf84c6cd14ef48f719df9c323e04daa874ab;hp=17d1de5e281fcb694da36e99281f4ecc2cec93fd;hpb=7da04cdea71382ff22ffd94e9b3ae9915c25422b;p=civicrm-core.git diff --git a/CRM/Campaign/Task.php b/CRM/Campaign/Task.php index 17d1de5e28..033772253c 100755 --- a/CRM/Campaign/Task.php +++ b/CRM/Campaign/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$ * */ @@ -46,7 +46,6 @@ class CRM_Campaign_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -54,7 +53,6 @@ class CRM_Campaign_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -62,14 +60,14 @@ class CRM_Campaign_Task { * These tasks are the core set of tasks that the user can perform * on a voter / group of voters * - * @return array the set of tasks for a group of voters. - * @static - * @access public + * @return array + * the set of tasks for a group of voters. */ - static function &tasks() { + public static function &tasks() { if (!(self::$_tasks)) { - self::$_tasks = array(1 => array( - 'title' => ts('Record Respondents Interview'), + self::$_tasks = array( + 1 => array( + 'title' => ts('Record Respondents Interview'), 'class' => array( 'CRM_Campaign_Form_Task_Interview', 'CRM_Campaign_Form_Task_Release', @@ -109,11 +107,10 @@ class CRM_Campaign_Task { * These tasks are the core set of task titles * on voters. * - * @return array the set of task titles - * @static - * @access public + * @return array + * the set of task titles */ - static function &taskTitles() { + public static function &taskTitles() { self::tasks(); $titles = array(); foreach (self::$_tasks as $id => $value) { @@ -129,10 +126,10 @@ class CRM_Campaign_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) { $tasks = self::taskTitles(); return $tasks; @@ -144,11 +141,10 @@ class CRM_Campaign_Task { * * @param int $value * - * @return array the set of tasks for a group of voters. - * @static - * @access public + * @return array + * the set of tasks for a group of voters. */ - static function getTask($value) { + public static function getTask($value) { self::tasks(); if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) { // make the interview task by default @@ -160,5 +156,5 @@ class CRM_Campaign_Task { self::$_tasks[$value]['result'], ); } -} +}