diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-02 22:26:28 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-02 22:26:28 +0500 |
| commit | d8c5c4f7468bb07d8de904437726557c6fa9b436 (patch) | |
| tree | c19af28e1ad6c2bf068bf64956461c25502f9bb3 /model/post.go | |
| parent | 813792dd600f4e485d52cc1066a8c1297578432d (diff) | |
| parent | 41069d83d2b6ad5cca599f75292027e13d5b10f7 (diff) | |
| download | chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.gz chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.bz2 chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into plt-375
Conflicts:
web/react/components/user_settings/user_settings_appearance.jsx
Diffstat (limited to 'model/post.go')
| -rw-r--r-- | model/post.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/model/post.go b/model/post.go index e78469940..1fc5963c3 100644 --- a/model/post.go +++ b/model/post.go @@ -120,7 +120,10 @@ func (o *Post) PreSave() { o.OriginalId = "" - o.CreateAt = GetMillis() + if o.CreateAt == 0 { + o.CreateAt = GetMillis() + } + o.UpdateAt = o.CreateAt if o.Props == nil { |