From: Donald A. Lobo <lobo@civicrm.org>
Date: Wed, 15 Jan 2014 22:23:59 +0000 (-0800)
Subject: CRM-13278 - Select fields for export "- related contact info -" fields are not sorted... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=82a06bfcf8ab06e3296c3795e69ca4cf6d2625ec;p=civicrm-core.git

CRM-13278 - Select fields for export "- related contact info -" fields are not sorted properly

http://issues.civicrm.org/jira/browse/CRM-13278
---

diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
index a74e2ed0c9..4eca12bb0d 100644
--- a/CRM/Core/BAO/Mapping.php
+++ b/CRM/Core/BAO/Mapping.php
@@ -560,6 +560,11 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
 
     foreach ($sel1 as $key => $sel) {
       if ($key) {
+        // sort everything BUT the contactType which is sorted seperately by
+        // an initial commit of CRM-13278 (check ksort above)
+        if (!in_array($key, $contactType)) {
+          asort($mapperFields[$key]);
+        }
         $sel2[$key] = array('' => ts('- select field -')) + $mapperFields[$key];
       }
     }