Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't use sub-path twice for manifest #14427

Closed
wants to merge 4 commits into from
Closed

Don't use sub-path twice for manifest #14427

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7b7484
Fixes #14422: Don't use sub-path twice for manifest
uli-heller Jan 22, 2021
cc151bb
make fmt
uli-heller Jan 22, 2021
8730121
Eliminate extra variable
uli-heller Jan 28, 2021
846bdfa
Move new code upwards
uli-heller Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions modules/setting/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,14 @@ func NewContext() {
// Suburl should start with '/' and end without '/', such as '/{subpath}'.
// This value is empty if site does not have sub-url.
AppSubURL = strings.TrimSuffix(appURL.Path, "/")
// FIXME: The fix related to logo.png does not work when the ordering of the following lines
// is changed.
// OK:
// ... sec.Key("STATIC_URL_PREFIX").MustString("") is first, sec.Key("STATIC_URL_PREFIX").MustString(AppSubURL) is 2nd
// KO:
// ... sec.Key("STATIC_URL_PREFIX").MustString("") is 2nd, sec.Key("STATIC_URL_PREFIX").MustString(AppSubURL) is first
// Can someone who knows go explain this?
AbsoluteAssetURL = MakeAbsoluteAssetURL(AppURL, strings.TrimSuffix(sec.Key("STATIC_URL_PREFIX").MustString(""), "/"))
StaticURLPrefix = strings.TrimSuffix(sec.Key("STATIC_URL_PREFIX").MustString(AppSubURL), "/")
AppSubURLDepth = strings.Count(AppSubURL, "/")
// Check if Domain differs from AppURL domain than update it to AppURL's domain
Expand All @@ -614,8 +622,6 @@ func NewContext() {
Domain = urlHostname
}

AbsoluteAssetURL = MakeAbsoluteAssetURL(AppURL, StaticURLPrefix)

manifestBytes := MakeManifestData(AppName, AppURL, AbsoluteAssetURL)
ManifestData = `application/json;base64,` + base64.StdEncoding.EncodeToString(manifestBytes)

Expand Down