summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-07-06 11:20:40 -0800
committer=Corey Hulen <corey@hulen.com>2015-07-06 11:20:40 -0800
commite3ab0a4e3ddb4b1bfacd2b82073c4a48e58751d6 (patch)
tree1bb90df1b0e35e420d3bafb4c4d586586ba88b3c /store
parent10b625ba1740c6177cfe5c06484f4a14867523bd (diff)
downloadchat-e3ab0a4e3ddb4b1bfacd2b82073c4a48e58751d6.tar.gz
chat-e3ab0a4e3ddb4b1bfacd2b82073c4a48e58751d6.tar.bz2
chat-e3ab0a4e3ddb4b1bfacd2b82073c4a48e58751d6.zip
team code review
Diffstat (limited to 'store')
-rw-r--r--store/sql_user_store.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index abb8f2781..776c4f8ac 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -95,7 +95,7 @@ func (us SqlUserStore) Save(user *model.User) StoreChannel {
return storeChannel
}
-func (us SqlUserStore) Update(user *model.User, allowRoleActiveUpdate bool) StoreChannel {
+func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreChannel {
storeChannel := make(StoreChannel)
@@ -125,7 +125,7 @@ func (us SqlUserStore) Update(user *model.User, allowRoleActiveUpdate bool) Stor
user.LastPingAt = oldUser.LastPingAt
user.EmailVerified = oldUser.EmailVerified
- if !allowRoleActiveUpdate {
+ if !allowActiveUpdate {
user.Roles = oldUser.Roles
user.DeleteAt = oldUser.DeleteAt
}