From 1012bce8bb33fac86b928f227892cee331eb2de4 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 31 Oct 2017 10:39:59 -0400 Subject: Remove license requirement for plugins (#7747) --- api4/plugin_test.go | 2 +- app/plugins.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api4/plugin_test.go b/api4/plugin_test.go index 0c39b2a89..82e11f775 100644 --- a/api4/plugin_test.go +++ b/api4/plugin_test.go @@ -25,7 +25,7 @@ func TestPlugin(t *testing.T) { require.NoError(t, err) defer os.RemoveAll(webappDir) - th := SetupEnterprise().InitBasic().InitSystemAdmin() + th := Setup().InitBasic().InitSystemAdmin() defer th.TearDown() enablePlugins := *th.App.Config().PluginSettings.Enable diff --git a/app/plugins.go b/app/plugins.go index c2e15b385..579b5d4e6 100644 --- a/app/plugins.go +++ b/app/plugins.go @@ -517,7 +517,7 @@ func (a *App) DisablePlugin(id string) *model.AppError { } func (a *App) InitPlugins(pluginPath, webappPath string) { - if !utils.IsLicensed() || !*utils.License().Features.FutureFeatures || !*a.Config().PluginSettings.Enable { + if !*a.Config().PluginSettings.Enable { return } -- cgit v1.2.3-1-g7c22