diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-18 09:25:47 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-18 09:25:47 -0700 |
| commit | cdf813f07b207c14bb9fa03f38d734b45e40823e (patch) | |
| tree | 109c6cefb3580b9ed9b314ce40bd130728d587ff /store/sql_user_store.go | |
| parent | 1aa4913c44ba9a342d240e5e1ca9d5e89929e499 (diff) | |
| parent | 5a436fd447753124b3f7705ecb123ecf5762bc24 (diff) | |
| download | chat-cdf813f07b207c14bb9fa03f38d734b45e40823e.tar.gz chat-cdf813f07b207c14bb9fa03f38d734b45e40823e.tar.bz2 chat-cdf813f07b207c14bb9fa03f38d734b45e40823e.zip | |
merging
Diffstat (limited to 'store/sql_user_store.go')
| -rw-r--r-- | store/sql_user_store.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 52d670d56..778df367e 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -325,9 +325,9 @@ func (s SqlUserStore) GetEtagForProfiles(teamId string) StoreChannel { updateAt, err := s.GetReplica().SelectInt("SELECT UpdateAt FROM Users WHERE TeamId = :TeamId ORDER BY UpdateAt DESC LIMIT 1", map[string]interface{}{"TeamId": teamId}) if err != nil { - result.Data = fmt.Sprintf("%v.%v", model.ETAG_ROOT_VERSION, model.GetMillis()) + result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, model.GetMillis()) } else { - result.Data = fmt.Sprintf("%v.%v", model.ETAG_ROOT_VERSION, updateAt) + result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, updateAt) } storeChannel <- result |