From 426ac5e0ad06c2287c9a29c9a98fee65a822c787 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 5 Jun 2014 15:54:29 +1200 Subject: [PATCH] spelling & removed unused var / fix impossible return --- CRM/Profile/Form.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php index e64b39ae77..1b8abfd80d 100644 --- a/CRM/Profile/Form.php +++ b/CRM/Profile/Form.php @@ -80,6 +80,11 @@ class CRM_Profile_Form extends CRM_Core_Form { */ public $_grid; + /** + * Name of button for saving matching contacts + * @var + */ + protected $_duplicateButtonName; /** * The title of the category we are editing * @@ -390,19 +395,19 @@ class CRM_Profile_Form extends CRM_Core_Form { } } - //transfering all the multirecord custom fields in _fields + //transferring all the multi-record custom fields in _fields if ($this->_multiRecord && !empty($this->_multiRecordFields)) { $this->_fields = $this->_multiRecordFields; $this->_multiRecordProfile = TRUE; } elseif ($this->_multiRecord && empty($this->_multiRecordFields)) { CRM_Core_Session::setStatus(ts('This feature is not currently available.'), ts('Sorry'), 'error'); - return CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm', 'reset=1')); + CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm', 'reset=1')); } } if (!is_array($this->_fields)) { CRM_Core_Session::setStatus(ts('This feature is not currently available.'), ts('Sorry'), 'error'); - return CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm', 'reset=1')); + CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm', 'reset=1')); } } @@ -676,7 +681,7 @@ class CRM_Profile_Form extends CRM_Core_Form { } } - //lets have sigle status message, + //lets have single status message, $this->assign('statusMessage', $statusMessage); if ($return) { return FALSE; @@ -1097,8 +1102,8 @@ class CRM_Profile_Form extends CRM_Core_Form { if ($this->_deleteButtonName) { if (!empty($_POST[$this->_deleteButtonName]) && $this->_recordId) { $filterParams['id'] = $this->_customGroupId; - $returnProperities = array('is_multiple', 'table_name'); - CRM_Core_DAO::commonRetrieve("CRM_Core_DAO_CustomGroup", $filterParams, $returnValues, $returnProperities); + $returnProperties = array('is_multiple', 'table_name'); + CRM_Core_DAO::commonRetrieve("CRM_Core_DAO_CustomGroup", $filterParams, $returnValues, $returnProperties); if (!empty($returnValues['is_multiple'])) { if ($tableName = CRM_Utils_Array::value('table_name', $returnValues)) { $sql = "DELETE FROM {$tableName} WHERE id = %1 AND entity_id = %2"; @@ -1158,10 +1163,9 @@ class CRM_Profile_Form extends CRM_Core_Form { $transaction = new CRM_Core_Transaction(); - //used to send subcribe mail to the group which user want. + //used to send subscribe mail to the group which user want. //if the profile double option in is enabled $mailingType = array(); - $config = CRM_Core_Config::singleton(); $result = NULL; foreach ($params as $name => $values) { -- 2.25.1