Merge pull request revel#809 from revel/patch/fixed_params

AnonX · AnonX · commit 7f4fb7444d9e · 2014-11-23T16:20:51.000+06:00
Static module: get prefix from fixed params explicitly
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A high productivity, full-stack web framework for the [Go language](http://www.golang.org).
 
-Current Version: 0.11.1 (Oct 27, 2014)
+Current Version: 0.11.2 (Nov 23, 2014)
 
 **As of Revel 0.11.0, Go 1.3+ is required.**
 
diff --git a/modules/static/app/controllers/static.go b/modules/static/app/controllers/static.go
@@ -43,8 +43,13 @@ type Static struct {
 //   Calls:
 //     Static.Serve("public/img", "favicon.png")
 func (c Static) Serve(prefix, filepath string) revel.Result {
-	var basePath string
+	// Fix for #503.
+	prefix = c.Params.Fixed.Get("prefix")
+	if prefix == "" {
+		return c.NotFound("")
+	}
 
+	var basePath string
 	if !fpath.IsAbs(prefix) {
 		basePath = revel.BasePath
 	}
@@ -87,6 +92,12 @@ func (c Static) Serve(prefix, filepath string) revel.Result {
 // as Static.Serve with the additional module name pre-pended to the list of
 // arguments.
 func (c Static) ServeModule(moduleName, prefix, filepath string) revel.Result {
+	// Fix for #503.
+	prefix = c.Params.Fixed.Get("prefix")
+	if prefix == "" {
+		return c.NotFound("")
+	}
+
 	var basePath string
 	for _, module := range revel.Modules {
 		if module.Name == moduleName {
