Merge pull request #7895 from cividesk/CRM-18130-master

[civicrm-core.git] / CRM / Member / Import / Parser.php

diff --git a/CRM/Member/Import/Parser.php b/CRM/Member/Import/Parser.php
index 64c694b0c11ef13cffda74a3cb7177ac7ae231f2..920ce53592972b549c8ab3512c0242b95c24a46a 100644 (file)
--- a/CRM/Member/Import/Parser.php
+++ b/CRM/Member/Import/Parser.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -245,32 +245,26 @@ abstract class CRM_Member_Import_Parser extends CRM_Import_Parser {
       if ($this->_invalidRowCount) {
         // removed view url for invlaid contacts
         $headers = array_merge(array(
-            ts('Line Number'),
-            ts('Reason'),
-          ),
-          $customHeaders
-        );
+          ts('Line Number'),
+          ts('Reason'),
+        ), $customHeaders);
         $this->_errorFileName = self::errorFileName(self::ERROR);
 
         self::exportCSV($this->_errorFileName, $headers, $this->_errors);
       }
       if ($this->_conflictCount) {
         $headers = array_merge(array(
-            ts('Line Number'),
-            ts('Reason'),
-          ),
-          $customHeaders
-        );
+          ts('Line Number'),
+          ts('Reason'),
+        ), $customHeaders);
         $this->_conflictFileName = self::errorFileName(self::CONFLICT);
         self::exportCSV($this->_conflictFileName, $headers, $this->_conflicts);
       }
       if ($this->_duplicateCount) {
         $headers = array_merge(array(
-            ts('Line Number'),
-            ts('View Membership URL'),
-          ),
-          $customHeaders
-        );
+          ts('Line Number'),
+          ts('View Membership URL'),
+        ), $customHeaders);
 
         $this->_duplicateFileName = self::errorFileName(self::DUPLICATE);
         self::exportCSV($this->_duplicateFileName, $headers, $this->_duplicates);