diff options
| author | JoramWilander <jwawilander@gmail.com> | 2018-07-10 15:01:43 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2018-07-10 15:01:43 -0400 |
| commit | 6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005 (patch) | |
| tree | 5564a47257bf6e85aaef711980c5b0fcb4d07dcc /cmd | |
| parent | c042ffa460296587579aff54b157a5109e022f7e (diff) | |
| parent | 1e1a5e5e85240f25c4faddcb24c5a29a915fe6e4 (diff) | |
| download | chat-6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005.tar.gz chat-6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005.tar.bz2 chat-6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005.zip | |
Merge branch 'plugins-2'
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mattermost/commands/server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index 9500d5dcb..1fab5c83a 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -98,10 +98,10 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform a.DoAdvancedPermissionsMigration() a.DoEmojisPermissionsMigration() - a.InitPlugins(*a.Config().PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory, nil) + a.InitPlugins(*a.Config().PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory) a.AddConfigListener(func(prevCfg, cfg *model.Config) { if *cfg.PluginSettings.Enable { - a.InitPlugins(*cfg.PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory, nil) + a.InitPlugins(*cfg.PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory) } else { a.ShutDownPlugins() } |