- more work on settings for FroxlorClients (upcoming multiserver-mode)

2010-10-18 09:20:17 +00:00
parent cad3c02f08
commit 699f451234
4 changed files with 148 additions and 17 deletions
--- a/lib/functions/settings/function.loadSettings.php
+++ b/lib/functions/settings/function.loadSettings.php
@@ -17,13 +17,10 @@
 * @version    $Id$
 */

-function loadSettings(&$settings_data, $db)
+function loadSettings(&$settings_data, $db, $server_id = 0)
 {
 	global $version;

-	// multi-server-support, get the destination server id (master = 0)
-	$server_id = getServerId();
-
 	$settings = array();

 	if(is_array($settings_data) && isset($settings_data['groups']) && is_array($settings_data['groups']))