3 files changed, 25 insertions, 10 deletions
diff --git a/api/context.go b/api/context.go
index 9a276a1a1..d90fbd9ee 100644
--- a/api/context.go
+++ b/api/context.go
@@ -456,18 +456,19 @@ func IsPrivateIpAddress(ipAddress string) bool {
 }
 
 func RenderWebError(err *model.AppError, w http.ResponseWriter, r *http.Request) {
+	props := make(map[string]string)
+	props["Message"] = err.Message
+	props["Details"] = err.DetailedError
 
-	protocol := GetProtocol(r)
-	SiteURL := protocol + "://" + r.Host
-
-	m := make(map[string]string)
-	m["Message"] = err.Message
-	m["Details"] = err.DetailedError
-	m["SiteName"] = utils.Cfg.TeamSettings.SiteName
-	m["SiteURL"] = SiteURL
+	pathParts := strings.Split(r.URL.Path, "/")
+	if len(pathParts) > 1 {
+		props["SiteURL"] = GetProtocol(r) + "://" + r.Host + "/" + pathParts[1]
+	} else {
+		props["SiteURL"] = GetProtocol(r) + "://" + r.Host
+	}
 
 	w.WriteHeader(err.StatusCode)
-	ServerTemplates.ExecuteTemplate(w, "error.html", m)
+	ServerTemplates.ExecuteTemplate(w, "error.html", Page{Props: props, ClientProps: utils.ClientProperties})
 }
 
 func Handle404(w http.ResponseWriter, r *http.Request) {
diff --git a/api/file.go b/api/file.go
index 694fc734c..1cb05e81b 100644
--- a/api/file.go
+++ b/api/file.go
@@ -13,6 +13,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
+	"github.com/mssola/user_agent"
 	"github.com/nfnt/resize"
 	"github.com/rwcarlsen/goexif/exif"
 	_ "golang.org/x/image/bmp"
@@ -426,6 +427,19 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Cache-Control", "max-age=2592000, public")
 	w.Header().Set("Content-Length", strconv.Itoa(len(f)))
 	w.Header().Set("Content-Type", mime.TypeByExtension(filepath.Ext(filename)))
+
+	// attach extra headers to trigger a download on IE and Edge
+	ua := user_agent.New(r.UserAgent())
+	bname, _ := ua.Browser()
+
+	if bname == "Edge" || bname == "Internet Explorer" {
+		// trim off anything before the final / so we just get the file's name
+		parts := strings.Split(filename, "/")
+
+		w.Header().Set("Content-Type", "application/octet-stream")
+		w.Header().Set("Content-Disposition", "attachment;filename=\""+parts[len(parts)-1]+"\"")
+	}
+
 	w.Write(f)
 }
 
diff --git a/api/templates/error.html b/api/templates/error.html
index 760578896..6b643556e 100644
--- a/api/templates/error.html
+++ b/api/templates/error.html
@@ -23,7 +23,7 @@
 		<div class="error__container">
 			<div class="error__icon"><i class="fa fa-exclamation-triangle"></i></div>
 			<h2>{{ .ClientProps.SiteName }} needs your help:</h2>
-			<p>{{.Message}}</p>
+			<p>{{ .Props.Message }}</p>
 			<a href="{{.Props.SiteURL}}">Go back to team site</a>
 		</div>
 	</div>