From 29cfa2e64fbbfecb5c866e05f863a0c08996fc1b Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 21 Nov 2016 12:19:21 -0500
Subject: [PATCH] Clear context error on post creation when create_at is set
 (#4615)

---
 api/post.go              | 1 +
 webapp/client/client.jsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/post.go b/api/post.go
index 69be291340..814d4e671d 100644
--- a/api/post.go
+++ b/api/post.go
@@ -134,6 +134,7 @@ func CreatePost(c *Context, post *model.Post, triggerWebhooks bool) (*model.Post
 
 	if post.CreateAt != 0 && !HasPermissionToContext(c, model.PERMISSION_MANAGE_SYSTEM) {
 		post.CreateAt = 0
+		c.Err = nil
 	}
 
 	post.Hashtags, _ = model.ParseHashtags(post.Message)
diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx
index 90ff750590..538e82a725 100644
--- a/webapp/client/client.jsx
+++ b/webapp/client/client.jsx
@@ -1508,7 +1508,7 @@ export default class Client {
             set(this.defaultHeaders).
             type('application/json').
             accept('application/json').
-            send(post).
+            send({...post, create_at: 0}).
             end(this.handleResponse.bind(this, 'createPost', success, error));
 
         this.track('api', 'api_posts_create', post.channel_id, 'length', post.message.length);