Merge pull request #14978 from eileenmcnaughton/map_field

 Fix (unreleased regression) e-notices on import form

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index bef2bec06059015e9ebcfed4d7147a5b26b9255d..08f9dd752b1c5b3e4e273793da21bc530b0ce775 100644 (file)
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -66,7 +66,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
    *
    * @return string
    */
-  public function defaultFromColumnName($columnName, &$patterns) {
+  public function defaultFromColumnName($columnName, $patterns) {
 
     if (!preg_match('/^[a-z0-9 ]$/i', $columnName)) {
       if ($columnKey = array_search($columnName, $this->_mapperFields)) {
@@ -400,7 +400,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
       $sel = &$this->addElement('hierselect', "mapper[$i]", ts('Mapper for Field %1', [1 => $i]), NULL);
 
       if ($this->get('savedMapping')) {
-        list($mappingName, $key, $defaults, $js, $columnPatterns, $dataPatterns) = $this->loadSavedMapping($mappingName, $i, $mappingRelation, $mappingWebsiteType, $mappingLocation, $mappingPhoneType, $mappingImProvider, $defaults, $formName, $js, $hasColumnNames);
+        list($mappingName, $key, $defaults, $js) = $this->loadSavedMapping($mappingName, $i, $mappingRelation, $mappingWebsiteType, $mappingLocation, $mappingPhoneType, $mappingImProvider, $defaults, $formName, $js, $hasColumnNames, $dataPatterns, $columnPatterns);
       }
       else {
         $js .= "swapOptions($formName, 'mapper[$i]', 0, 3, 'hs_mapper_0_');\n";
@@ -541,7 +541,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
    *
    * @return array
    */
-  public function formatCustomFieldName(&$fields) {
+  public function formatCustomFieldName($fields) {
     //CRM-2676, replacing the conflict for same custom field name from different custom group.
     $fieldIds = $formattedFieldNames = [];
     foreach ($fields as $key => $value) {
@@ -860,10 +860,12 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
    * @param string $formName
    * @param string $js
    * @param bool $hasColumnNames
+   * @param array $dataPatterns
+   * @param array $columnPatterns
    *
    * @return array
    */
-  protected function loadSavedMapping($mappingName, $i, $mappingRelation, $mappingWebsiteType, $mappingLocation, $mappingPhoneType, $mappingImProvider, $defaults, $formName, $js, $hasColumnNames) {
+  protected function loadSavedMapping($mappingName, $i, $mappingRelation, $mappingWebsiteType, $mappingLocation, $mappingPhoneType, $mappingImProvider, $defaults, $formName, $js, $hasColumnNames, $dataPatterns, $columnPatterns) {
     $jsSet = FALSE;
     if (isset($mappingName[$i])) {
       if ($mappingName[$i] != ts('- do not import -')) {
@@ -999,7 +1001,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
         $defaults["mapper[$i]"] = [$this->defaultFromData($dataPatterns, $i)];
       }
     }
-    return [$mappingName, $key, $defaults, $js, $columnPatterns, $dataPatterns];
+    return [$mappingName, $key, $defaults, $js];
   }
 
 }

diff --git a/CRM/Import/Form/MapField.php b/CRM/Import/Form/MapField.php
index c6a82f7877a96f9381a6e6ef554f9a1bd26a12d0..654f2732686a311c2a0d1f7f56867a74399dd558 100644 (file)
--- a/CRM/Import/Form/MapField.php
+++ b/CRM/Import/Form/MapField.php
@@ -121,7 +121,7 @@ abstract class CRM_Import_Form_MapField extends CRM_Core_Form {
    *
    * @return string
    */
-  public function defaultFromData(&$patterns, $index) {
+  public function defaultFromData($patterns, $index) {
     $best = '';
     $bestHits = 0;
     $n = count($this->_dataValues);