diff --git a/modules/Users/models/Module.php b/modules/Users/models/Module.php index a3aa0f4335164167f6275a7f337f2afef6bedb80..dbfc99323bff4336c93970e18b1ea410402fe9d0 100644 --- a/modules/Users/models/Module.php +++ b/modules/Users/models/Module.php @@ -260,6 +260,7 @@ class Users_Module_Model extends Vtiger_Module_Model { $label = decode_html($adb->query_result($result, $i, 'label')); $languages_list[$lang_prefix] = $label; } + asort($languages_list); return $languages_list; } diff --git a/modules/Vtiger/models/Field.php b/modules/Vtiger/models/Field.php index c912c6898207396a154fa85113188eab86d180bf..20aa746712f6ce34a7a402a862063a4aed10431f 100644 --- a/modules/Vtiger/models/Field.php +++ b/modules/Vtiger/models/Field.php @@ -989,12 +989,13 @@ class Vtiger_Field_Model extends Vtiger_Field { */ public function getCurrencyList() { $db = PearDatabase::getInstance(); - $result = $db->pquery('SELECT * FROM vtiger_currency_info WHERE currency_status = ? AND deleted=0', array('Active')); + $result = $db->pquery('SELECT id, currency_name FROM vtiger_currency_info WHERE currency_status = ? AND deleted=0', array('Active')); for($i=0; $i<$db->num_rows($result); $i++) { $currencyId = $db->query_result($result, $i, 'id'); $currencyName = $db->query_result($result, $i, 'currency_name'); $currencies[$currencyId] = $currencyName; } + asort($currencies); return $currencies; } diff --git a/vtlib/Vtiger/LanguageExport.php b/vtlib/Vtiger/LanguageExport.php index 760cb96a36326b413506e465c3beed3ce19cdf43..83fa170a9951ab0591e4dbba133263170d99e60d 100644 --- a/vtlib/Vtiger/LanguageExport.php +++ b/vtlib/Vtiger/LanguageExport.php @@ -222,6 +222,7 @@ class Vtiger_LanguageExport extends Vtiger_Package { $languageinfo[$prefix] = $label; } } + asort($languageinfo); return $languageinfo; } }