dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent nil from causing problems with functions/settings.lua.

Browse Source
This commit is contained in:
markjcrane
2015-07-08 15:36:33 -03:00
parent d140e264ef
commit c0a6c121f2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/resources/functions/settings.lua
+2
View File
@@ -52,6 +52,7 @@
--get the default settings --get the default settings
sql = "SELECT * FROM v_default_settings "; sql = "SELECT * FROM v_default_settings ";
sql = sql .. "WHERE default_setting_enabled = 'true' "; sql = sql .. "WHERE default_setting_enabled = 'true' ";
sql = sql .. "AND default_setting_value is null ";
sql = sql .. "ORDER BY default_setting_category, default_setting_subcategory ASC"; sql = sql .. "ORDER BY default_setting_category, default_setting_subcategory ASC";
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "SQL: " .. sql .. "\n"); freeswitch.consoleLog("notice", "SQL: " .. sql .. "\n");
@@ -100,6 +101,7 @@
sql = "SELECT * FROM v_domain_settings "; sql = "SELECT * FROM v_domain_settings ";
sql = sql .. "WHERE domain_uuid = '" .. domain_uuid .. "' "; sql = sql .. "WHERE domain_uuid = '" .. domain_uuid .. "' ";
sql = sql .. "AND domain_setting_enabled = 'true' "; sql = sql .. "AND domain_setting_enabled = 'true' ";
sql = sql .. "AND domain_setting_value is null ";
sql = sql .. "ORDER BY domain_setting_category, domain_setting_subcategory ASC "; sql = sql .. "ORDER BY domain_setting_category, domain_setting_subcategory ASC ";
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[directory] SQL: " .. sql .. "\n"); freeswitch.consoleLog("notice", "[directory] SQL: " .. sql .. "\n");