IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix shadowed variables: Part 4 (#10009)

Browse Source
This commit is contained in:
Hanzei
2018-12-18 14:06:53 +01:00
committed by GitHub
parent cebfa38a64
commit b68720360b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/channel.go
View File

@@ -517,24 +517,24 @@ func (a *App) PatchChannel(channel *model.Channel, patch *model.ChannelPatch, us
} }
if oldChannelDisplayName != channel.DisplayName { if oldChannelDisplayName != channel.DisplayName {
if err := a.PostUpdateChannelDisplayNameMessage(userId, channel, oldChannelDisplayName, channel.DisplayName); err != nil { if err = a.PostUpdateChannelDisplayNameMessage(userId, channel, oldChannelDisplayName, channel.DisplayName); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
} }
} }
if channel.Header != oldChannelHeader { if channel.Header != oldChannelHeader {
if err := a.PostUpdateChannelHeaderMessage(userId, channel, oldChannelHeader, channel.Header); err != nil { if err = a.PostUpdateChannelHeaderMessage(userId, channel, oldChannelHeader, channel.Header); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
} }
} }
if channel.Purpose != oldChannelPurpose { if channel.Purpose != oldChannelPurpose {
if err := a.PostUpdateChannelPurposeMessage(userId, channel, oldChannelPurpose, channel.Purpose); err != nil { if err = a.PostUpdateChannelPurposeMessage(userId, channel, oldChannelPurpose, channel.Purpose); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
} }
} }
return channel, err return channel, nil
} }
func (a *App) GetSchemeRolesForChannel(channelId string) (string, string, *model.AppError) { func (a *App) GetSchemeRolesForChannel(channelId string) (string, string, *model.AppError) {