nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 03:33:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

User Settings: Select query fix, case adjustment on Domain Template select option labels.

Browse Source
This commit is contained in:
reliberate
2016-03-21 16:54:59 -06:00
parent 66bcb6e836
commit 5fe4309166
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/users/user_settings.php
View File

@@ -93,8 +93,10 @@ else {
//get the list
$sql = "select * from v_user_settings ";
$sql .= "where user_uuid = '$user_uuid' ";
$sql .= "and (user_setting_category <> 'domain' and user_setting_subcategory <> 'language') ";
$sql .= "and (user_setting_category <> 'domain' and user_setting_subcategory <> 'time_zone') ";
$sql .= "and not ( ";
$sql .= "(user_setting_category = 'domain' and user_setting_subcategory = 'language') ";
$sql .= "or (user_setting_category = 'domain' and user_setting_subcategory = 'time_zone') ";
$sql .= ") ";
if (strlen($order_by) == 0) {
$sql .= "order by user_setting_category, user_setting_subcategory, user_setting_order asc ";
}