diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
commit | 8fb66c2b834ee4e0669de173e5ddfebd56c34d58 (patch) | |
tree | 9e8e66772d44c4f9010a48c8e0afed70421238b1 /cmd/platform | |
parent | 4208e42ba9df02b9c4bd7081179922c21206d83d (diff) | |
parent | aafb8be87c79c60df7534b3b69f967c6301b157e (diff) | |
download | chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.gz chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.bz2 chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.zip |
Merge branch 'release-3.6'
Diffstat (limited to 'cmd/platform')
-rw-r--r-- | cmd/platform/oldcommands.go | 3 | ||||
-rw-r--r-- | cmd/platform/user.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/platform/oldcommands.go b/cmd/platform/oldcommands.go index 1cf898882..a599fa47e 100644 --- a/cmd/platform/oldcommands.go +++ b/cmd/platform/oldcommands.go @@ -319,7 +319,8 @@ func cmdInviteUser() { } invites := []string{flagEmail} - api.InviteMembers(team, user.GetDisplayName(), invites) + c := getMockContext() + api.InviteMembers(team, user.GetDisplayName(), invites, c.GetSiteURL()) os.Exit(0) } diff --git a/cmd/platform/user.go b/cmd/platform/user.go index 43a00e68d..373274241 100644 --- a/cmd/platform/user.go +++ b/cmd/platform/user.go @@ -261,7 +261,7 @@ func inviteUser(email string, team *model.Team, teamArg string) { CommandPrintErrorln("Can't find team '" + teamArg + "'") return } - api.InviteMembers(team, "Administrator", invites) + api.InviteMembers(team, "Administrator", invites, *utils.Cfg.ServiceSettings.SiteURL) CommandPrettyPrintln("Invites may or may not have been sent.") } |