diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-11-02 21:30:29 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-11-02 21:30:29 -0500 |
| commit | c68e53aa23ebaf657d2ba29e5db83271e79bea1e (patch) | |
| tree | 14516f03d539a714102a66b9f638afe8a096d1cb /web/web.go | |
| parent | d1ac94502908de8a490d81468a1da353b459093d (diff) | |
| parent | 6db2dd90793db3e10464c342b27e24764655cb1b (diff) | |
| download | chat-c68e53aa23ebaf657d2ba29e5db83271e79bea1e.tar.gz chat-c68e53aa23ebaf657d2ba29e5db83271e79bea1e.tar.bz2 chat-c68e53aa23ebaf657d2ba29e5db83271e79bea1e.zip | |
Merge pull request #1275 from mattermost/PLT-951
PLT-951 PLT-972 fixing issues with team directory
Diffstat (limited to 'web/web.go')
| -rw-r--r-- | web/web.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go index 34f4df08f..51f6664b6 100644 --- a/web/web.go +++ b/web/web.go @@ -170,7 +170,7 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) { page.Props[team.Name] = team.DisplayName } - if len(teams) == 1 && *utils.Cfg.TeamSettings.EnableTeamListing { + if len(teams) == 1 && *utils.Cfg.TeamSettings.EnableTeamListing && !utils.Cfg.TeamSettings.EnableTeamCreation { http.Redirect(w, r, c.GetSiteURL()+"/"+teams[0].Name, http.StatusTemporaryRedirect) return } |