From 9050149a7b122c419086550b3639b7bb086460e3 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sat, 9 May 2015 21:46:20 +1200 Subject: [PATCH] Removed unused parameter from function signature --- CRM/Activity/Form/Activity.php | 1 - CRM/Activity/Form/Task/Batch.php | 1 - CRM/Activity/Import/Parser/Activity.php | 1 - CRM/Batch/Form/Entry.php | 2 -- CRM/Campaign/Form/Campaign.php | 1 - CRM/Campaign/Form/Petition/Signature.php | 1 - CRM/Campaign/Form/Survey/Main.php | 1 - CRM/Campaign/Form/Task/Interview.php | 1 - CRM/Case/Form/Activity.php | 1 - CRM/Case/Form/Case.php | 2 -- CRM/Contact/Form/Contact.php | 1 - CRM/Contribute/BAO/Contribution/Utils.php | 1 - CRM/Contribute/Form/AdditionalInfo.php | 1 - CRM/Contribute/Form/Task/Batch.php | 1 - CRM/Contribute/Import/Parser/Contribution.php | 2 -- CRM/Core/BAO/Address.php | 1 - CRM/Core/BAO/CustomField.php | 3 --- CRM/Core/BAO/CustomValueTable.php | 1 - CRM/Event/Form/ManageEvent/EventInfo.php | 1 - CRM/Event/Form/Participant.php | 1 - CRM/Event/Form/Task/Batch.php | 1 - CRM/Event/Import/Parser/Participant.php | 2 -- CRM/Grant/Form/Grant.php | 1 - CRM/Group/Form/Edit.php | 1 - CRM/Member/Form/Membership.php | 1 - CRM/Member/Form/MembershipRenewal.php | 1 - CRM/Member/Form/Task/Batch.php | 1 - CRM/Member/Import/Parser/Membership.php | 2 -- CRM/Pledge/Form/Pledge.php | 1 - 29 files changed, 36 deletions(-) diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index a3e76f4375..39d9c37e31 100644 --- a/CRM/Activity/Form/Activity.php +++ b/CRM/Activity/Form/Activity.php @@ -908,7 +908,6 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { ) ); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_activityId, 'Activity' ); diff --git a/CRM/Activity/Form/Task/Batch.php b/CRM/Activity/Form/Task/Batch.php index 9381c74d41..7d1b71b063 100755 --- a/CRM/Activity/Form/Task/Batch.php +++ b/CRM/Activity/Form/Task/Batch.php @@ -221,7 +221,6 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task { foreach ($params['field'] as $key => $value) { $value['custom'] = CRM_Core_BAO_CustomField::postProcess($value, - CRM_Core_DAO::$_nullObject, $key, 'Activity' ); $value['id'] = $key; diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php index 206c912520..778d0b322e 100644 --- a/CRM/Activity/Import/Parser/Activity.php +++ b/CRM/Activity/Import/Parser/Activity.php @@ -298,7 +298,6 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Activity_Import_Parser { } $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - CRM_Core_DAO::$_nullObject, NULL, 'Activity' ); diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php index d2904973f6..02daea9a3b 100755 --- a/CRM/Batch/Form/Entry.php +++ b/CRM/Batch/Form/Entry.php @@ -463,7 +463,6 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { } $value['custom'] = CRM_Core_BAO_CustomField::postProcess($value, - CRM_Core_DAO::$_nullObject, NULL, 'Contribution' ); @@ -674,7 +673,6 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { //check for custom data $value['custom'] = CRM_Core_BAO_CustomField::postProcess($params['field'][$key], - $customFields, $key, 'Membership', $membershipTypeId diff --git a/CRM/Campaign/Form/Campaign.php b/CRM/Campaign/Form/Campaign.php index 923d7838c9..2fe34bcc7b 100644 --- a/CRM/Campaign/Form/Campaign.php +++ b/CRM/Campaign/Form/Campaign.php @@ -365,7 +365,6 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form { CRM_Utils_Array::value('campaign_type_id', $params) ); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_campaignId, 'Campaign' ); diff --git a/CRM/Campaign/Form/Petition/Signature.php b/CRM/Campaign/Form/Petition/Signature.php index b7b6ae238a..0affe05a24 100644 --- a/CRM/Campaign/Form/Petition/Signature.php +++ b/CRM/Campaign/Form/Petition/Signature.php @@ -515,7 +515,6 @@ class CRM_Campaign_Form_Petition_Signature extends CRM_Core_Form { ); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customActivityFields, NULL, 'Activity' ); diff --git a/CRM/Campaign/Form/Survey/Main.php b/CRM/Campaign/Form/Survey/Main.php index 2a7090f649..c855a78262 100644 --- a/CRM/Campaign/Form/Survey/Main.php +++ b/CRM/Campaign/Form/Survey/Main.php @@ -216,7 +216,6 @@ class CRM_Campaign_Form_Survey_Main extends CRM_Campaign_Form_Survey { $params['is_default'] = CRM_Utils_Array::value('is_default', $params, 0); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_surveyId, 'Survey' ); diff --git a/CRM/Campaign/Form/Task/Interview.php b/CRM/Campaign/Form/Task/Interview.php index cfee48b717..b427d5099b 100755 --- a/CRM/Campaign/Form/Task/Interview.php +++ b/CRM/Campaign/Form/Task/Interview.php @@ -498,7 +498,6 @@ WHERE {$clause} //format custom fields. $customParams = CRM_Core_BAO_CustomField::postProcess($params, - $surveyFields, $activityId, 'Activity' ); diff --git a/CRM/Case/Form/Activity.php b/CRM/Case/Form/Activity.php index 8562997cca..5ad909a51b 100644 --- a/CRM/Case/Form/Activity.php +++ b/CRM/Case/Form/Activity.php @@ -473,7 +473,6 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity { ) ); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_activityId, 'Activity' ); diff --git a/CRM/Case/Form/Case.php b/CRM/Case/Form/Case.php index 56721b0c40..30861c118a 100644 --- a/CRM/Case/Form/Case.php +++ b/CRM/Case/Form/Case.php @@ -376,7 +376,6 @@ class CRM_Case_Form_Case extends CRM_Core_Form { $customFields = array(); $params['custom'] = CRM_Core_BAO_CustomField::postProcess( $params, - $customFields, NULL, 'Case' ); @@ -423,7 +422,6 @@ class CRM_Case_Form_Case extends CRM_Core_Form { ) ); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_activityId, 'Activity' ); diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php index 877ab7e551..7406f373ac 100644 --- a/CRM/Contact/Form/Contact.php +++ b/CRM/Contact/Form/Contact.php @@ -946,7 +946,6 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { $customFieldExtends = (CRM_Utils_Array::value('contact_sub_type', $params)) ? $params['contact_sub_type'] : $params['contact_type']; $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_contactId, $customFieldExtends, TRUE diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php index 0d84798531..81cb9e71e7 100644 --- a/CRM/Contribute/BAO/Contribution/Utils.php +++ b/CRM/Contribute/BAO/Contribution/Utils.php @@ -798,7 +798,6 @@ INNER JOIN civicrm_contact contact ON ( contact.id = contrib.contact_id ) ) ); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, CRM_Utils_Array::value('id', $params, NULL), 'Contribution' ); diff --git a/CRM/Contribute/Form/AdditionalInfo.php b/CRM/Contribute/Form/AdditionalInfo.php index 74f53f0c3e..ec8246020f 100644 --- a/CRM/Contribute/Form/AdditionalInfo.php +++ b/CRM/Contribute/Form/AdditionalInfo.php @@ -324,7 +324,6 @@ class CRM_Contribute_Form_AdditionalInfo { ) ); $formatted['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, CRM_Utils_Array::value('id', $params, NULL), 'Contribution' ); diff --git a/CRM/Contribute/Form/Task/Batch.php b/CRM/Contribute/Form/Task/Batch.php index 89916cd2ab..3bfb76a318 100644 --- a/CRM/Contribute/Form/Task/Batch.php +++ b/CRM/Contribute/Form/Task/Batch.php @@ -221,7 +221,6 @@ class CRM_Contribute_Form_Task_Batch extends CRM_Contribute_Form_Task { foreach ($params['field'] as $key => $value) { $value['custom'] = CRM_Core_BAO_CustomField::postProcess($value, - CRM_Core_DAO::$_nullObject, $key, 'Contribution' ); diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php index d68c552230..09e322953d 100644 --- a/CRM/Contribute/Import/Parser/Contribution.php +++ b/CRM/Contribute/Import/Parser/Contribution.php @@ -355,7 +355,6 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa if ($onDuplicate != CRM_Import_Parser::DUPLICATE_UPDATE) { $formatted['custom'] = CRM_Core_BAO_CustomField::postProcess($formatted, - CRM_Core_DAO::$_nullObject, NULL, 'Contribution' ); @@ -375,7 +374,6 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa if ($ids['contribution']) { $formatted['id'] = $ids['contribution']; $formatted['custom'] = CRM_Core_BAO_CustomField::postProcess($formatted, - CRM_Core_DAO::$_nullObject, $formatted['id'], 'Contribution' ); diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php index 287a4975e9..d3065a3c20 100644 --- a/CRM/Core/BAO/Address.php +++ b/CRM/Core/BAO/Address.php @@ -170,7 +170,6 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address { } if (!empty($customFields)) { $addressCustom = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $address->id, 'Address', TRUE diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index 5c20bf5b9e..d42fc14530 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -2234,8 +2234,6 @@ ORDER BY html_type"; /** * @param array $params - * @param array $customFields - * Unused parameter * @param int $entityID * @param $customFieldExtends * @param bool $inline @@ -2244,7 +2242,6 @@ ORDER BY html_type"; */ public static function postProcess( &$params, - $customFields, $entityID, $customFieldExtends, $inline = FALSE diff --git a/CRM/Core/BAO/CustomValueTable.php b/CRM/Core/BAO/CustomValueTable.php index fade2e6c31..10c3778727 100644 --- a/CRM/Core/BAO/CustomValueTable.php +++ b/CRM/Core/BAO/CustomValueTable.php @@ -360,7 +360,6 @@ class CRM_Core_BAO_CustomValueTable { */ public static function postProcess(&$params, $entityTable, $entityID, $customFieldExtends) { $customData = CRM_Core_BAO_CustomField::postProcess($params, - array(), $entityID, $customFieldExtends ); diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php index 2b3e1a701a..d41bdd13db 100644 --- a/CRM/Event/Form/ManageEvent/EventInfo.php +++ b/CRM/Event/Form/ManageEvent/EventInfo.php @@ -294,7 +294,6 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent { CRM_Utils_Array::value('event_type_id', $params) ); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_id, 'Event' ); diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index 812c10af5c..0930d5b95c 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -1164,7 +1164,6 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment $customFields = CRM_Utils_Array::crmArrayMerge($customFieldsEvent, $customFields); $customFields = CRM_Utils_Array::crmArrayMerge($customFieldsEventType, $customFields); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_id, 'Participant' ); diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php index 6b9179dacb..04a6805859 100644 --- a/CRM/Event/Form/Task/Batch.php +++ b/CRM/Event/Form/Task/Batch.php @@ -278,7 +278,6 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task { //check for custom data $value['custom'] = CRM_Core_BAO_CustomField::postProcess($value, - CRM_Core_DAO::$_nullObject, $key, 'Participant' ); diff --git a/CRM/Event/Import/Parser/Participant.php b/CRM/Event/Import/Parser/Participant.php index a3c6548fdf..8d72d37ddc 100644 --- a/CRM/Event/Import/Parser/Participant.php +++ b/CRM/Event/Import/Parser/Participant.php @@ -352,7 +352,6 @@ class CRM_Event_Import_Parser_Participant extends CRM_Event_Import_Parser { if ($onDuplicate != CRM_Import_Parser::DUPLICATE_UPDATE) { $formatted['custom'] = CRM_Core_BAO_CustomField::postProcess($formatted, - CRM_Core_DAO::$_nullObject, NULL, 'Participant' ); @@ -363,7 +362,6 @@ class CRM_Event_Import_Parser_Participant extends CRM_Event_Import_Parser { $dao->id = $formatValues['participant_id']; $formatted['custom'] = CRM_Core_BAO_CustomField::postProcess($formatted, - CRM_Core_DAO::$_nullObject, $formatValues['participant_id'], 'Participant' ); diff --git a/CRM/Grant/Form/Grant.php b/CRM/Grant/Form/Grant.php index f0a807b321..5dbc078249 100644 --- a/CRM/Grant/Form/Grant.php +++ b/CRM/Grant/Form/Grant.php @@ -302,7 +302,6 @@ class CRM_Grant_Form_Grant extends CRM_Core_Form { CRM_Core_BAO_CustomField::getFields('Grant', FALSE, FALSE, NULL, NULL, TRUE) ); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_id, 'Grant' ); diff --git a/CRM/Group/Form/Edit.php b/CRM/Group/Form/Edit.php index 7143eb20c9..c1ac4981df 100644 --- a/CRM/Group/Form/Edit.php +++ b/CRM/Group/Form/Edit.php @@ -396,7 +396,6 @@ WHERE title = %1 $customFields = CRM_Core_BAO_CustomField::getFields('Group'); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, - $customFields, $this->_id, 'Group' ); diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index c82743847a..ee262e0ec6 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -1177,7 +1177,6 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; ); $membershipTypeValues[$memType]['custom'] = CRM_Core_BAO_CustomField::postProcess($formValues, - $customFields, $this->_id, 'Membership' ); diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index ffafcf6d93..407942784d 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -639,7 +639,6 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; ); $customFieldsFormatted = CRM_Core_BAO_CustomField::postProcess($formValues, - $customFields, $this->_id, 'Membership' ); diff --git a/CRM/Member/Form/Task/Batch.php b/CRM/Member/Form/Task/Batch.php index 61233474ed..b17ebff90b 100644 --- a/CRM/Member/Form/Task/Batch.php +++ b/CRM/Member/Form/Task/Batch.php @@ -254,7 +254,6 @@ class CRM_Member_Form_Task_Batch extends CRM_Member_Form_Task { } //check for custom data $value['custom'] = CRM_Core_BAO_CustomField::postProcess($params['field'][$key], - $customFields, $key, 'Membership', $membershipTypeId diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php index 358826b8d6..303d7800e3 100644 --- a/CRM/Member/Import/Parser/Membership.php +++ b/CRM/Member/Import/Parser/Membership.php @@ -356,7 +356,6 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser { if ($onDuplicate != CRM_Import_Parser::DUPLICATE_UPDATE) { $formatted['custom'] = CRM_Core_BAO_CustomField::postProcess($formatted, - CRM_Core_DAO::$_nullObject, NULL, 'Membership' ); @@ -380,7 +379,6 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser { } $formatted['custom'] = CRM_Core_BAO_CustomField::postProcess($formatted, - CRM_Core_DAO::$_nullObject, $formatValues['membership_id'], 'Membership' ); diff --git a/CRM/Pledge/Form/Pledge.php b/CRM/Pledge/Form/Pledge.php index 7b3d66da80..58366d6833 100644 --- a/CRM/Pledge/Form/Pledge.php +++ b/CRM/Pledge/Form/Pledge.php @@ -569,7 +569,6 @@ class CRM_Pledge_Form_Pledge extends CRM_Core_Form { $customFields = CRM_Core_BAO_CustomField::getFields('Pledge'); $params['custom'] = CRM_Core_BAO_CustomField::postProcess($formValues, - $customFields, $this->_id, 'Pledge' ); -- 2.25.1