From 47e0a78776dd998952365c1cd387e6b21f58a5de Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 13 Dec 2019 16:14:31 +0100
Subject: [locationinfo] Don't disable SLX_ADDONS in split-login mode

---
 modules-available/locationinfo/inc/locationinfohooks.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules-available/locationinfo/inc/locationinfohooks.inc.php b/modules-available/locationinfo/inc/locationinfohooks.inc.php
index b10be51b..b7bdda14 100644
--- a/modules-available/locationinfo/inc/locationinfohooks.inc.php
+++ b/modules-available/locationinfo/inc/locationinfohooks.inc.php
@@ -44,6 +44,7 @@ class LocationInfoHooks
 			} else { // Automatic login
 				RunMode::updateClientFlag($machineUuid, 'locationinfo', false);
 				ConfigHolder::add('SLX_AUTOLOGIN', '1', 1000);
+				ConfigHolder::add('SLX_ADDONS', '', 1000);
 			}
 			if (isset($data['interactive']) && $data['interactive']) {
 				ConfigHolder::add('SLX_BROWSER_INTERACTIVE', '1', 1000);
@@ -64,8 +65,8 @@ class LocationInfoHooks
 			ConfigHolder::add('SLX_BROWSER_URL', 'http://' . $_SERVER['SERVER_ADDR'] . '/panel/' . $panelUuid);
 			ConfigHolder::add('SLX_BROWSER_INSECURE', '1'); // TODO: Sat server might redirect to HTTPS, which in turn could have a self-signed cert - push to client
 			ConfigHolder::add('SLX_AUTOLOGIN', '1', 1000);
+			ConfigHolder::add('SLX_ADDONS', '', 1000);
 		}
-		ConfigHolder::add('SLX_ADDONS', '', 1000);
 		ConfigHolder::add('SLX_LOGOUT_TIMEOUT', '', 1000);
 		ConfigHolder::add('SLX_SCREEN_STANDBY_TIMEOUT', '', 1000);
 		ConfigHolder::add('SLX_SYSTEM_STANDBY_TIMEOUT', '', 1000);
-- 
cgit v1.2.3-55-g7522