From c06e42b24a1bf8184d98148ebe4f5d0782afd34d Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 14 Dec 2018 06:13:21 -0500 Subject: [PATCH] Include PluginsEnabled in limited client config (#9998) --- utils/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/config.go b/utils/config.go index f08237cb6c..f5c49b9b8a 100644 --- a/utils/config.go +++ b/utils/config.go @@ -581,8 +581,6 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["EnableUserTypingMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableUserTypingMessages) props["EnableChannelViewedMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableChannelViewedMessages) - props["PluginsEnabled"] = strconv.FormatBool(*c.PluginSettings.Enable) - props["RunJobs"] = strconv.FormatBool(*c.JobSettings.RunJobs) props["EnableEmailInvitations"] = strconv.FormatBool(*c.ServiceSettings.EnableEmailInvitations) @@ -746,6 +744,8 @@ func GenerateLimitedClientConfig(c *model.Config, diagnosticId string, license * hasImageProxy := c.ServiceSettings.ImageProxyType != nil && *c.ServiceSettings.ImageProxyType != "" && c.ServiceSettings.ImageProxyURL != nil && *c.ServiceSettings.ImageProxyURL != "" props["HasImageProxy"] = strconv.FormatBool(hasImageProxy) + props["PluginsEnabled"] = strconv.FormatBool(*c.PluginSettings.Enable) + // Set default values for all options that require a license. props["EnableCustomBrand"] = "false" props["CustomBrandText"] = ""