Fix MakeAbsoluteAssetURL.

KN4CK3R · KN4CK3R · commit e823e33da6e9 · 2023-08-29T14:12:21.000Z
diff --git a/modules/setting/server.go b/modules/setting/server.go
@@ -15,7 +15,6 @@ import (
 
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/util"
 )
 
 // Scheme describes protocol types
@@ -160,7 +159,11 @@ func MakeAbsoluteAssetURL(appURL, staticURLPrefix string) string {
 		}
 
 		// StaticURLPrefix is just a path
-		return util.URLJoin(appURL, strings.TrimSuffix(staticURLPrefix, "/"))
+		base, err := url.Parse(appURL)
+		if err != nil {
+			log.Fatal("Unable to parse url: %v", err)
+		}
+		return base.ResolveReference(parsedPrefix).String()
 	}
 
 	return strings.TrimSuffix(staticURLPrefix, "/")

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ import (`
`15`	`15`
`16`	`16`	`"code.gitea.io/gitea/modules/json"`
`17`	`17`	`"code.gitea.io/gitea/modules/log"`
`18`		`- "code.gitea.io/gitea/modules/util"`
`19`	`18`	`)`
`20`	`19`
`21`	`20`	`// Scheme describes protocol types`
`@@ -160,7 +159,11 @@ func MakeAbsoluteAssetURL(appURL, staticURLPrefix string) string {`
`160`	`159`	`}`
`161`	`160`
`162`	`161`	`// StaticURLPrefix is just a path`
`163`		`- return util.URLJoin(appURL, strings.TrimSuffix(staticURLPrefix, "/"))`
	`162`	`+ base, err := url.Parse(appURL)`
	`163`	`+ if err != nil {`
	`164`	`+ log.Fatal("Unable to parse url: %v", err)`
	`165`	`+ }`
	`166`	`+ return base.ResolveReference(parsedPrefix).String()`
`164`	`167`	`}`
`165`	`168`
`166`	`169`	`return strings.TrimSuffix(staticURLPrefix, "/")`