Skip to content
This repository was archived by the owner on Jun 2, 2025. It is now read-only.

Commit 74320c8

Browse files
committed
fix legacy html and remove SiteID as ulids or nothing
1 parent 400aa93 commit 74320c8

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

flow.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func New(w http.ResponseWriter, req *http.Request, renderer *render.Render, stor
4242
flow.req = req
4343
flow.Renderer = renderer
4444
flow.store = store
45-
flow.Padlock = security.New(req, store.Settings, key)
45+
flow.Padlock = security.New(req, key)
4646
flow.hasPopulated = false
4747

4848
proto := "http://"
@@ -66,10 +66,6 @@ func (flow *Flow) WebsiteBaseURL() string {
6666
return flow.store.Settings.Get("WEBSITE_BASE_URL")
6767
}
6868

69-
func (flow *Flow) SiteID() int {
70-
return flow.Padlock.SiteID()
71-
}
72-
7369
func (flow *Flow) SiteULID() (string, error) {
7470
return flow.Padlock.SiteULID()
7571
}
@@ -327,7 +323,7 @@ func (flow *Flow) htmlAlt(w io.Writer, layout string, status int, master string)
327323
return flow.Renderer.HTML(w, status, layout, flow.bucket.vars)
328324
}
329325

330-
func (flow *Flow) HTML(bucket bucket, layout string, status int) {
326+
func (flow *Flow) HTML(layout string, status int) {
331327
err := flow.HTMLalt(layout, status, "")
332328
flow.catchAfterErr(err)
333329
}

0 commit comments

Comments
 (0)