From 2221b3e3a523f49e8472e49c2d5b9f18006537b9 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 14 Aug 2014 21:35:37 +0100 Subject: [PATCH] Whitespace/comment cleanup --- CRM/Campaign/Form/Campaign.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/CRM/Campaign/Form/Campaign.php b/CRM/Campaign/Form/Campaign.php index e29457c3fc..4fbff48b15 100644 --- a/CRM/Campaign/Form/Campaign.php +++ b/CRM/Campaign/Form/Campaign.php @@ -136,7 +136,7 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form { * * @access public * - * @return void + * @return array */ function setDefaultValues() { $defaults = $this->_values; @@ -246,16 +246,14 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form { ); // add Campaign Parent Id - $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns(CRM_Utils_Array::value('parent_id', $this->_values), - $this->_campaignId - ); + $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns(CRM_Utils_Array::value('parent_id', $this->_values), $this->_campaignId); if (!empty($campaigns)) { - $this->addElement('select', 'parent_id', ts('Parent Id'), - array( - '' => ts('- select Parent -')) + $campaigns + $this->addElement('select', 'parent_id', ts('Parent ID'), + array('' => ts('- select Parent -')) + $campaigns, + array('class' => 'crm-select2') ); } -$groups = CRM_Core_PseudoConstant::nestedGroup(); + $groups = CRM_Core_PseudoConstant::nestedGroup(); //get the campaign groups. $this->add('select', 'includeGroups', ts('Include Group(s)'), @@ -304,7 +302,7 @@ $groups = CRM_Core_PseudoConstant::nestedGroup(); * @param $files * @param $errors * - * @return void + * @return bool|array * @access public * @see valid_date */ -- 2.25.1