update

Author: admpub

context_x_base.go

@@ -476,14 +476,19 @@ func (c *XContext) DispatchPath() string {
 //  URLGenerator
 
 func (c *XContext) RelativeURL(uri string) string {
-	return c.echo.uriAddLangCode(c, c.echo.MakeRelativeURL(uri, false))
+	uri = AddExtension(c, uri)
+	return c.echo.wrapURI(c, c.echo.MakeRelativeURL(uri, false), true)
 }
 
 func (c *XContext) URLFor(uri string, relative ...bool) string {
 	if len(relative) > 0 && relative[0] {
 		return c.RelativeURL(uri)
 	}
-	return c.siteRoot() + c.echo.uriAddLangCode(c, c.echo.MakeRelativeURL(uri, false))
+	if len(uri) == 0 {
+		return c.Site()
+	}
+	uri = AddExtension(c, uri)
+	return c.siteRoot() + c.echo.wrapURI(c, c.echo.MakeRelativeURL(uri, false), true)
 }
 
 func (c *XContext) URLByName(name string, args ...interface{}) string {

echo.go

@@ -935,8 +935,10 @@ func (e *Echo) wrapURI(c Context, uri string, withoutExt bool) string {
 	if e.rewriter != nil {
 		uri = e.rewriter.Rewrite(uri)
 	}
-	if !withoutExt && len(e.defaultExtension) > 0 && !strings.HasSuffix(uri, e.defaultExtension) {
-		uri += e.defaultExtension
+	if !withoutExt {
+		if extension := c.DefaultExtension(); len(extension) > 0 && !strings.HasSuffix(uri, extension) {
+			uri += extension
+		}
 	}
 	uri = e.uriAddLangCode(c, uri)
 	return uri

helper.go

@@ -362,3 +362,16 @@ func ParseTemplateError(err error, sourceContent string) *PanicError {
 	}
 	return p
 }
+
+// AddExtension adds the default extension to the URI if it does not already have it.
+func AddExtension(c Context, uri string) string {
+	if len(uri) == 0 || strings.HasSuffix(uri, `/`) || len(c.DefaultExtension()) == 0 {
+		return uri
+	}
+	parts := strings.SplitN(uri, `?`, 2)
+	if !strings.HasSuffix(parts[0], c.DefaultExtension()) {
+		parts[0] += c.DefaultExtension()
+		uri = strings.Join(parts, `?`)
+	}
+	return uri
+}