summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-22 08:39:49 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-22 08:39:49 -0500
commit040bff2b9f384b88179f6ec1beb40d92102c9ba3 (patch)
tree3ca1d4648ae1a81531af7347fe59c48a23d1657f /store
parentb55a0ae034175055de3922b77bd059742317514c (diff)
parent5d4b18605a3fc7493e7ad5aecfe5f83d1d32b8e0 (diff)
downloadchat-040bff2b9f384b88179f6ec1beb40d92102c9ba3.tar.gz
chat-040bff2b9f384b88179f6ec1beb40d92102c9ba3.tar.bz2
chat-040bff2b9f384b88179f6ec1beb40d92102c9ba3.zip
Merge pull request #2199 from rgarmsen2295/plt-1688
PLT-1688 Fixed issue with corrupted custom mentions on username change
Diffstat (limited to 'store')
-rw-r--r--store/sql_user_store.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index b1544289d..d866f949a 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -159,7 +159,7 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha
nonUsernameKeys = append(nonUsernameKeys, key)
}
}
- user.NotifyProps["mention_keys"] = strings.Join(nonUsernameKeys, ",") + user.Username + ",@" + user.Username
+ user.NotifyProps["mention_keys"] = strings.Join(nonUsernameKeys, ",") + "," + user.Username + ",@" + user.Username
}
if count, err := us.GetMaster().Update(user); err != nil {