Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use php to require an array #19370

Merged
merged 1 commit into from
Jan 12, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions CRM/Activity/Import/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
protected $_haveColumnHeader;

/**
* @param string $fileName
* @param array $fileName
* @param string $separator
* @param $mapper
* @param bool $skipColumnHeader
Expand All @@ -57,7 +57,7 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
* @throws Exception
*/
public function run(
$fileName,
array $fileName,
$separator = ',',
&$mapper,
$skipColumnHeader = FALSE,
Expand All @@ -66,9 +66,7 @@ public function run(
$statusID = NULL,
$totalRowCount = NULL
) {
if (!is_array($fileName)) {
throw new CRM_Core_Exception('Unable to determine import file');
}

$fileName = $fileName['name'];

$this->init();
Expand Down