From 9f8fdae069e86ffb3daf84d030db87d2073edbe3 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Mon, 21 Nov 2016 13:20:50 -0200
Subject: [PATCH] fixed last conflict

---
 .../message/messageBox.coffee                   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-ui-message/message/messageBox.coffee b/packages/rocketchat-ui-message/message/messageBox.coffee
index 90979197a41..62c2f3f61ae 100644
--- a/packages/rocketchat-ui-message/message/messageBox.coffee
+++ b/packages/rocketchat-ui-message/message/messageBox.coffee
@@ -77,7 +77,15 @@ Template.messageBox.helpers
 		return RocketChat.settings.get('FileUpload_MediaTypeWhiteList')
 
 	showFileUpload: ->
-		return RocketChat.settings.get('FileUpload_Enabled')
+		if (RocketChat.settings.get('FileUpload_Enabled'))
+			roomData = Session.get('roomData' + this._id)
+			if roomData?.t is 'd'
+				return RocketChat.settings.get('FileUpload_Enabled_Direct')
+			else
+				return true
+		else
+			return RocketChat.settings.get('FileUpload_Enabled')
+
 
 	showMic: ->
 		return Template.instance().showMicButton.get()
@@ -89,13 +97,6 @@ Template.messageBox.helpers
 		if not Template.instance().isMessageFieldEmpty.get()
 			return 'show-send'
 
-	showFileUpload: ->
-		roomData = Session.get('roomData' + this._id)
-		if roomData?.t is 'd'
-			return RocketChat.settings.get('FileUpload_Enabled_Direct')
-		else
-			return true
-
 	showLocation: ->
 		return RocketChat.Geolocation.get() isnt false