From: Tim Otten Date: Tue, 6 Jan 2015 22:56:54 +0000 (-0800) Subject: INFRA-132 - CRM/Custom - Misc X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=40b55be5d01c5d20b9a335f7a463ed018d06c531;p=civicrm-core.git INFRA-132 - CRM/Custom - Misc --- diff --git a/CRM/Custom/Form/CustomData.php b/CRM/Custom/Form/CustomData.php index 4fbb0f69c3..c7fd99cb9b 100644 --- a/CRM/Custom/Form/CustomData.php +++ b/CRM/Custom/Form/CustomData.php @@ -49,7 +49,8 @@ class CRM_Custom_Form_CustomData { * * @return void */ - static function preProcess(&$form, $subName = NULL, $subType = NULL, + static function preProcess( + &$form, $subName = NULL, $subType = NULL, $groupCount = NULL, $type = NULL, $entityID = NULL, $onlySubType = NULL ) { if ($type) { diff --git a/CRM/Custom/Import/Parser.php b/CRM/Custom/Import/Parser.php index e08e3a7520..8b209c8a6c 100644 --- a/CRM/Custom/Import/Parser.php +++ b/CRM/Custom/Import/Parser.php @@ -76,7 +76,8 @@ abstract class CRM_Custom_Import_Parser extends CRM_Contact_Import_Parser { * @return mixed * @throws Exception */ - function run($fileName, + function run( + $fileName, $separator = ',', &$mapper, $skipColumnHeader = FALSE,