From 4e6490d466dbd9ba64c74c67f41b82e4cc5dffae Mon Sep 17 00:00:00 2001 From: Eileen Date: Mon, 24 Feb 2014 13:57:22 +1300 Subject: [PATCH] CRM-14196 - states missing from export fuzion fix - part 2 = resulting e-notice --- CRM/Contact/BAO/Query.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index d108d6eaa9..df337ec92e 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -765,13 +765,13 @@ class CRM_Contact_BAO_Query { $this->_select[$name] = "contact_a.{$fieldName} as `$name`"; } } - elseif (in_array($tName, array('state_province', 'country', 'county'))) { - $this->_pseudoConstantsSelect[$pf]['select'] = "{$field['where']} as `$name`"; - $this->_pseudoConstantsSelect[$pf]['element'] = $name; - if ($tName == 'state_province') { - $this->_pseudoConstantsSelect[$tName]['select'] = "{$field['where']} as `$name`"; - $this->_pseudoConstantsSelect[$tName]['element'] = $name; - } + elseif (in_array($tName, array('country', 'county'))) { + $this->_pseudoConstantsSelect[$name]['select'] = "{$field['where']} as `$name`"; + $this->_pseudoConstantsSelect[$name]['element'] = $name; + } + elseif ($tName == 'state_province') { + $this->_pseudoConstantsSelect[$tName]['select'] = "{$field['where']} as `$name`"; + $this->_pseudoConstantsSelect[$tName]['element'] = $name; } else { $this->_select[$name] = "{$field['where']} as `$name`"; -- 2.25.1