From 2e68a233af0e72b034ed0cbaa881c8da1f4ffc5e Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 14 Apr 2022 13:37:53 +1200
Subject: [PATCH] [REF] Minor clean up

---
 CRM/Contact/Import/Form/DataSource.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php
index bc8972dd9a..8a76bb05f3 100644
--- a/CRM/Contact/Import/Form/DataSource.php
+++ b/CRM/Contact/Import/Form/DataSource.php
@@ -57,7 +57,7 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Forms {
     }
 
     while ($file = readdir($handler)) {
-      if ($file != '.' && $file != '..' &&
+      if ($file !== '.' && $file !== '..' &&
         in_array($file, $errorFiles) && !is_writable($config->uploadDir . $file)
       ) {
         $results[] = $file;
@@ -164,7 +164,6 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Forms {
 
     CRM_Core_Form_Date::buildAllowedDateFormats($this);
 
-    $config = CRM_Core_Config::singleton();
     $geoCode = FALSE;
     if (CRM_Utils_GeocodeProvider::getUsableClassName()) {
       $geoCode = TRUE;
@@ -195,18 +194,15 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Forms {
   /**
    * Set the default values of various form elements.
    *
-   * access        public
-   *
    * @return array
    *   reference to the array of default values
    */
   public function setDefaultValues() {
-    $config = CRM_Core_Config::singleton();
     $defaults = [
       'dataSource' => 'CRM_Import_DataSource_CSV',
       'onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP,
       'contactType' => CRM_Import_Parser::CONTACT_INDIVIDUAL,
-      'fieldSeparator' => $config->fieldSeparator,
+      'fieldSeparator' => CRM_Core_Config::singleton()->fieldSeparator,
     ];
 
     if ($this->get('loadedMapping')) {
-- 
2.25.1