nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-02-04 06:59:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance [master] Default settings sort order (#2593)

Browse Source 
add to the sort order for default/domain settings so when a type is
array without *_setting_order the values will sort in order
This commit is contained in:
Mafoo
2017-06-03 19:36:56 +01:00
committed by FusionPBX
parent 159f1b3c5a
commit 90a96ad4d0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/default_settings/default_settings.php
View File

@@ -314,7 +314,7 @@ else {
//get the list
$sql = "select * from v_default_settings ";
if (strlen($order_by) == 0) {
$sql .= "order by default_setting_category, default_setting_subcategory, default_setting_order asc ";
$sql .= "order by default_setting_category, default_setting_subcategory, default_setting_order asc, default_setting_name, default_setting_value ";
}
else {
$sql .= "order by $order_by $order ";

2
core/domain_settings/domain_settings.php
View File

@@ -126,7 +126,7 @@ if (sizeof($_REQUEST) > 1) {
$sql = "select * from v_domain_settings ";
$sql .= "where domain_uuid = '$domain_uuid' ";
if (strlen($order_by) == 0) {
$sql .= "order by domain_setting_category, domain_setting_subcategory, domain_setting_order asc ";
$sql .= "order by domain_setting_category, domain_setting_subcategory, domain_setting_order asc, domain_setting_name, domain_setting_value ";
}
else {
$sql .= "order by $order_by $order ";