X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMember%2FImport%2FForm%2FPreview.php;h=2a7041f48dcbfa00b487e5fadcd60276ad1eddb2;hb=56e22db05619193f5048ebd41357966a3a728a34;hp=c34451e0c6e55794e2c17e5d50da6efa1eec1f44;hpb=e62c1ceec55f32b89c4e1e1db612fa7cc4e9702f;p=civicrm-core.git diff --git a/CRM/Member/Import/Form/Preview.php b/CRM/Member/Import/Form/Preview.php index c34451e0c6..2a7041f48d 100644 --- a/CRM/Member/Import/Form/Preview.php +++ b/CRM/Member/Import/Form/Preview.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.7 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2015 | + | Copyright CiviCRM LLC (c) 2004-2016 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -28,7 +28,7 @@ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2015 + * @copyright CiviCRM LLC (c) 2004-2016 * $Id$ * */ @@ -113,14 +113,12 @@ class CRM_Member_Import_Form_Preview extends CRM_Import_Form_Preview { */ public function postProcess() { $fileName = $this->controller->exportValue('DataSource', 'uploadFile'); + $seperator = $this->controller->exportValue('DataSource', 'fieldSeparator'); $skipColumnHeader = $this->controller->exportValue('DataSource', 'skipColumnHeader'); $invalidRowCount = $this->get('invalidRowCount'); $conflictRowCount = $this->get('conflictRowCount'); $onDuplicate = $this->get('onDuplicate'); - $config = CRM_Core_Config::singleton(); - $seperator = $config->fieldSeparator; - $mapper = $this->controller->exportValue('MapField', 'mapper'); $mapperKeys = array(); $mapperLocType = array();