Enable caching on assets and avatars (#3376)

* Enable caching on assets and avatars

Fixes #3323

* Only set avatar in user BeforeUpdate when there is no avatar set

* add error checking after stat

* gofmt

* Change cache time for avatars to an hour

1 files changed, 10 insertions, 13 deletions

diff --git a/modules/public/static.go b/modules/public/static.go
index f68400d329..10e32dbd10 100644
--- a/modules/public/static.go
+++ b/modules/public/static.go
@@ -13,17 +13,14 @@ import (
 
 // Static implements the macaron static handler for serving assets.
 func Static(opts *Options) macaron.Handler {
-	return macaron.Static(
-		opts.Directory,
-		macaron.StaticOptions{
-			SkipLogging: opts.SkipLogging,
-			FileSystem: bindata.Static(bindata.Options{
-				Asset:      Asset,
-				AssetDir:   AssetDir,
-				AssetInfo:  AssetInfo,
-				AssetNames: AssetNames,
-				Prefix:     "",
-			}),
-		},
-	)
+	opts.FileSystem = bindata.Static(bindata.Options{
+		Asset:      Asset,
+		AssetDir:   AssetDir,
+		AssetInfo:  AssetInfo,
+		AssetNames: AssetNames,
+		Prefix:     "",
+	})
+	// we don't need to pass the directory, because the directory var is only
+	// used when in the options there is no FileSystem.
+	return opts.staticHandler("")
 }