diff options
author | =Corey Hulen <corey@hulen.com> | 2015-07-29 01:39:43 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-07-29 01:39:43 -0800 |
commit | 4244990bf118c04d4d66dd946aaf5217fc59a393 (patch) | |
tree | 9cfad1eec8a462577e1723c62b70520994c0920a /store/sql_channel_store.go | |
parent | 9677a9f71777d75f3def0b0cb238050a30ec6a67 (diff) | |
parent | d222f6c7a3c69a68879cc0fd5aeb7343d72dfb39 (diff) | |
download | chat-4244990bf118c04d4d66dd946aaf5217fc59a393.tar.gz chat-4244990bf118c04d4d66dd946aaf5217fc59a393.tar.bz2 chat-4244990bf118c04d4d66dd946aaf5217fc59a393.zip |
Merge branch 'master' into mm-1355
Diffstat (limited to 'store/sql_channel_store.go')
-rw-r--r-- | store/sql_channel_store.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 8961d5d97..f64558a92 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -120,7 +120,7 @@ func (s SqlChannelStore) Update(channel *model.Channel) StoreChannel { if count, err := s.GetMaster().Update(channel); err != nil { if IsUniqueConstraintError(err.Error(), "Name", "channels_name_teamid_key") { dupChannel := model.Channel{} - s.GetReplica().SelectOne(&dupChannel, "SELECT * FROM Channels WHERE TeamId=? AND Name=? AND DeleteAt > 0", channel.TeamId, channel.Name) + s.GetReplica().SelectOne(&dupChannel, "SELECT * FROM Channels WHERE TeamId = :TeamId AND Name= :Name AND DeleteAt > 0", map[string]interface{}{"TeamId": channel.TeamId, "Name": channel.Name}) if dupChannel.DeleteAt > 0 { result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name was previously created", "id="+channel.Id+", "+err.Error()) } else { |