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

Fix the per domain boolean settings

Browse Source
This commit is contained in:
FusionPBX
2026-01-02 01:09:14 -07:00
committed by GitHub
parent c3cd4eada3
commit 3e3f998810
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/classes/settings.php
View File

@@ -4,7 +4,7 @@
* The settings class is used to load settings using hierarchical overriding
*
* The settings are loaded from the database tables default_settings, domain_settings, and user_settings in that order
* with Each setting overrides the setting from the previous table.
* Each table overrides the setting with the same name from the previous table.
*
* @access public
* @author Mark Crane <mark@fusionpbx.com>
@@ -220,7 +220,7 @@ class settings implements clear_cache {
$key = 'settings_domain_' . $domain_uuid;
$result = '';
//if the apcu extension is loaded get the cached database result
//if the apcu extension is available then get the cached database result
if ($this->apcu_enabled && apcu_exists($key)) {
$result = apcu_fetch($key);
} else {
@@ -229,7 +229,7 @@ class settings implements clear_cache {
$sql .= "and domain_setting_enabled = true ";
$parameters['domain_uuid'] = $domain_uuid;
$result = $this->database->select($sql, $parameters, 'all');
//if the apcu extension is loaded store the result
//if the apcu extension is available, then store the result
if ($this->apcu_enabled) {
apcu_store($key, $result);
}
@@ -253,8 +253,7 @@ class settings implements clear_cache {
if (isset($row['domain_setting_value']) && $row['domain_setting_value'] !== '') {
if ($name == "boolean") {
$this->settings[$category][$subcategory] = filter_var($row['domain_setting_value'], FILTER_VALIDATE_BOOLEAN);
}
if ($name == "array") {
} elseif ($name == "array") {
if (!isset($this->settings[$category][$subcategory]) || !is_array($this->settings[$category][$subcategory])) {
$this->settings[$category][$subcategory] = [];
}