Fix incorrect operator on previous Export fix

[eileenmcnaughton]

Overview

Follow up fix to #12212 where I used the wrong operator on $value[4]

Before

code has different meaning to pre-refactor

After

code has same meaning

Technical Details

This re-instates the original code more closely but on testing through the UI I can't see any way that $value[2] would be empty if $value[4] is not ie the elseif actually seems unreachable to me - so perhaps we don't need this & should instead remove the possibility of it. Hmmm

          if (!empty($value[2])) {
            $relationField = CRM_Utils_Array::value(2, $value);
            if (trim(CRM_Utils_Array::value(3, $value))) {
              $relLocTypeId = CRM_Utils_Array::value(3, $value);
            }
            else {
              $relLocTypeId = 'Primary';
            }

            if ($relationField == 'phone') {
              $relPhoneTypeId = CRM_Utils_Array::value(4, $value);
            }
            elseif ($relationField == 'im') {
              $relIMProviderId = CRM_Utils_Array::value(4, $value);
            }
          }
          elseif (!empty($value[4])) {
            $relationField = CRM_Utils_Array::value(4, $value);
            $relLocTypeId = CRM_Utils_Array::value(5, $value);
            if ($relationField == 'phone') {
              $relPhoneTypeId = CRM_Utils_Array::value(6, $value);
            }
            elseif ($relationField == 'im') {
              $relIMProviderId = CRM_Utils_Array::value(6, $value);
            }
          }

Comments

@monishdeb per #12272 do you agree we need this in the rc?

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[monishdeb]

Yes without a doubt. I am merging this as I tested earlier in my local and again on test build.

[eileenmcnaughton]

@monishdeb did you figure out how to reach those rows I mentioned?