From: yashodha <yashodha.chaku@webaccess.co.in>
Date: Mon, 26 Aug 2013 10:09:52 +0000 (+0530)
Subject: CRM-13278
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c49a1c1ab70fc44070442ba2ad5e471bf89dd7a9;p=civicrm-core.git

CRM-13278
---

diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
index cd28f41a1d..daea5f6dfa 100644
--- a/CRM/Core/BAO/Mapping.php
+++ b/CRM/Core/BAO/Mapping.php
@@ -328,7 +328,7 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
 
       // exclude the address options disabled in the Address Settings
       $fields[$value] = CRM_Core_BAO_Address::validateAddressOptions($contactFields);
-
+      ksort($fields[$value]);
       if ($mappingType == 'Export') {
         $relationships = array();
         $relationshipTypes = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, NULL, NULL, $value);
@@ -560,7 +560,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
 
     foreach ($sel1 as $key => $sel) {
       if ($key) {
-        asort($mapperFields[$key]);
         $sel2[$key] = array('' => ts('- select field -')) + $mapperFields[$key];
       }
     }