Merge branch '1.11-update'

This commit is contained in:
takezoe
2014-03-03 00:04:18 +09:00

View File

@@ -116,7 +116,7 @@ abstract class ControllerBase extends ScalatraFilter
includeContextPath: Boolean = true, includeServletPath: Boolean = true) includeContextPath: Boolean = true, includeServletPath: Boolean = true)
(implicit request: HttpServletRequest, response: HttpServletResponse) = (implicit request: HttpServletRequest, response: HttpServletResponse) =
if (path.startsWith("http")) path if (path.startsWith("http")) path
else baseUrl + url(path, params, includeContextPath, includeServletPath) else baseUrl + url(path, params, false, false)
} }