From a8460b7570c4263c284d37a36ae31114d4aaf8dd Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 19 Oct 2010 08:10:22 +0000 Subject: [PATCH] - fix loading of settings in case of older Froxlor versions which do not support multiserver-mode --- lib/functions/settings/function.loadSettings.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/functions/settings/function.loadSettings.php b/lib/functions/settings/function.loadSettings.php index 5c76b53a..0fd363a6 100644 --- a/lib/functions/settings/function.loadSettings.php +++ b/lib/functions/settings/function.loadSettings.php @@ -19,8 +19,14 @@ function loadSettings(&$settings_data, $db, $server_id = 0) { - global $version; - + // to check whether we're on a recent + // Froxlor installation which supports + // multiserver-settings, we have to read + // the version from the database + $_dbversion = ''; + $_dv = $db->query_first("SELECT `value` FROM `".TABLE_PANEL_SETTINGS."` WHERE `varname` = 'version';"); + $_dbversion = $_dv['value']; + $settings = array(); if(is_array($settings_data) && isset($settings_data['groups']) && is_array($settings_data['groups'])) @@ -46,7 +52,7 @@ function loadSettings(&$settings_data, $db, $server_id = 0) // but versions before 0.9.14-svn7 don't have the `sid` field // in panel_settings, so only append the condition if we're on // 0.9.14-svn7 or higher - if(compareFroxlorVersion('0.9.14-svn7', $version)) + if(compareFroxlorVersion('0.9.14-svn7', $_dbversion)) { $sql_query_sid = 'AND `sid` = \''. (int)$server_id . '\' '; } else {