summaryrefslogtreecommitdiffstats
path: root/api/user.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-21 17:34:13 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-21 17:34:13 -0700
commit0529a494ae6b541f917522a20de92e3d36615f65 (patch)
tree401c6faf7ca0eb90fdc9a88910d792c28b82ac02 /api/user.go
parente863096358dd64ecf2de6efeec3db132cdc8d6b9 (diff)
downloadchat-0529a494ae6b541f917522a20de92e3d36615f65.tar.gz
chat-0529a494ae6b541f917522a20de92e3d36615f65.tar.bz2
chat-0529a494ae6b541f917522a20de92e3d36615f65.zip
Adding image properties
Diffstat (limited to 'api/user.go')
-rw-r--r--api/user.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/user.go b/api/user.go
index 352e1f0e1..32dfa7dfb 100644
--- a/api/user.go
+++ b/api/user.go
@@ -704,7 +704,7 @@ func getProfileImage(c *Context, w http.ResponseWriter, r *http.Request) {
} else {
var img []byte
- if !utils.IsS3Configured() && !utils.Cfg.ServiceSettings.UseLocalStorage {
+ if len(utils.Cfg.ImageSettings.DriverName) == 0 {
var err *model.AppError
if img, err = createProfileImage(result.Data.(*model.User).Username, id); err != nil {
c.Err = err
@@ -741,8 +741,8 @@ func getProfileImage(c *Context, w http.ResponseWriter, r *http.Request) {
}
func uploadProfileImage(c *Context, w http.ResponseWriter, r *http.Request) {
- if !utils.IsS3Configured() && !utils.Cfg.ServiceSettings.UseLocalStorage {
- c.Err = model.NewAppError("uploadProfileImage", "Unable to upload file. Amazon S3 not configured and local server storage turned off. ", "")
+ if len(utils.Cfg.ImageSettings.DriverName) == 0 {
+ c.Err = model.NewAppError("uploadProfileImage", "Unable to upload file. Image storage is not configured.", "")
c.Err.StatusCode = http.StatusNotImplemented
return
}