From 37dfa911c06fd9cafc0accf790c19e4b7ce7e31d Mon Sep 17 00:00:00 2001 From: Tim Fry Date: Mon, 31 Mar 2025 09:48:59 -0300 Subject: [PATCH] re-use the database object from settings object --- resources/classes/settings.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/classes/settings.php b/resources/classes/settings.php index 66172254fd..b190013169 100644 --- a/resources/classes/settings.php +++ b/resources/classes/settings.php @@ -457,13 +457,14 @@ class settings implements clear_cache { apcu_delete($key); } } - global $settings, $domain_uuid, $user_uuid; + global $settings; //check there is a settings object if (!empty($settings) && ($settings instanceof settings)) { + $database = $settings->database(); $domain_uuid = $settings->get_domain_uuid(); $user_uuid = $settings->get_user_uuid(); //recreate the settings object to reload all settings from database - $settings = new settings(['database' => database::new(), 'domain_uuid' => $domain_uuid, 'user_uuid' => $user_uuid]); + $settings = new settings(['database' => $database, 'domain_uuid' => $domain_uuid, 'user_uuid' => $user_uuid]); } } }