Skip to content

Commit bb7b7f7

Browse files
committed
fix logic for public assets
1 parent 96a818d commit bb7b7f7

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

modules/public/public.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,8 @@ func CustomAssets() *assetfs.Layer {
3232
return assetfs.Local("custom", setting.CustomPath, "public")
3333
}
3434

35-
func StaticAssets() *assetfs.Layer {
36-
return assetfs.Local("static", setting.StaticRootPath, "public")
37-
}
38-
3935
func AssetFS() *assetfs.LayeredFS {
40-
if setting.HasBuiltinBindata {
41-
return assetfs.Layered(CustomAssets(), StaticAssets(), BuiltinAssets()) // old behavior: always include StaticAssets
42-
} else {
43-
return assetfs.Layered(CustomAssets(), BuiltinAssets()) // now BuiltinAssets is StaticAssets
44-
}
36+
return assetfs.Layered(CustomAssets(), BuiltinAssets())
4537
}
4638

4739
// AssetsHandlerFunc implements the static handler for serving custom or original assets.

0 commit comments

Comments
 (0)