From 9afab633b589f11822aa4d23ad2812623f00d882 Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 12 Apr 2019 17:18:11 +1000 Subject: [PATCH] [REF] calll formatLocationBlock from parent function. This is about starting to unnest the spaghetti of functions here..... Just deprecating for now in case --- CRM/Contact/Import/Parser.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CRM/Contact/Import/Parser.php b/CRM/Contact/Import/Parser.php index 1585008c7d..0f0951443d 100644 --- a/CRM/Contact/Import/Parser.php +++ b/CRM/Contact/Import/Parser.php @@ -847,7 +847,13 @@ abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser { } if (!$break) { - $this->formatContactParameters($value, $formatted); + if (!empty($value['location_type_id'])) { + $this->formatLocationBlock($value, $formatted); + } + else { + CRM_Core_Error::deprecatedFunctionWarning('this is not expected to be reachable now'); + $this->formatContactParameters($value, $formatted); + } } } if (!$isAddressCustomField) { @@ -1130,6 +1136,7 @@ abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser { // get the formatted location blocks into params - w/ 3.0 format, CRM-4605 if (!empty($values['location_type_id'])) { + CRM_Core_Error::deprecatedFunctionWarning('this is not expected to be reachable now'); return $this->formatLocationBlock($values, $params); } -- 2.25.1