From 1cd25cf3806f6ceb2e47a3bc791569cedd0acf1d Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 25 Jan 2016 09:43:40 -0500
Subject: Fixed serverside errors occurring when getting files with no
 extension

---
 model/file_info.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'model/file_info.go')

diff --git a/model/file_info.go b/model/file_info.go
index 131baff6d..f785042b3 100644
--- a/model/file_info.go
+++ b/model/file_info.go
@@ -32,6 +32,11 @@ func GetInfoForBytes(filename string, data []byte) (*FileInfo, *AppError) {
 		mimeType = mime.TypeByExtension(extension)
 	}
 
+	if extension != "" && extension[0] == '.' {
+		// the client expects a file extension without the leading period
+		extension = extension[1:]
+	}
+
 	hasPreviewImage := isImage
 	if mimeType == "image/gif" {
 		// just show the gif itself instead of a preview image for animated gifs
@@ -45,7 +50,7 @@ func GetInfoForBytes(filename string, data []byte) (*FileInfo, *AppError) {
 	return &FileInfo{
 		Filename:        filename,
 		Size:            size,
-		Extension:       extension[1:],
+		Extension:       extension,
 		MimeType:        mimeType,
 		HasPreviewImage: hasPreviewImage,
 	}, nil
-- 
cgit v1.2.3-1-g7c22