MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-24 21:42:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix wrong init dependency on markup extensions (#7038)

Browse source 
* fix wrong init dependency on markup extensions
This commit is contained in:
Lunny Xiao 2019-05-26 01:15:39 +08:00 committed by zeripath
parent 0c432d26fe
commit 355ab0c62c
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/web.go
View file

@ -15,7 +15,6 @@ import (
"strings"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup/external"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/routers"
"code.gitea.io/gitea/routers/routes"
@ -111,8 +110,6 @@ func runWeb(ctx *cli.Context) error {
routers.GlobalInit()
external.RegisterParsers()
m := routes.NewMacaron()
routes.RegisterRoutes(m)

2
contrib/pr/checkout.go
View file

@ -20,6 +20,7 @@ import (
"strconv"
"time"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/external"
"code.gitea.io/gitea/routers"
"code.gitea.io/gitea/routers/routes"
@ -113,6 +114,7 @@ func runPR() {
log.Printf("[PR] Setting up router\n")
//routers.GlobalInit()
external.RegisterParsers()
markup.Init()
m := routes.NewMacaron()
routes.RegisterRoutes(m)

8
modules/markup/markup.go
View file

@ -15,6 +15,14 @@ import (
func Init() {
getIssueFullPattern()
NewSanitizer()
// since setting maybe changed extensions, this will reload all parser extensions mapping
extParsers = make(map[string]Parser)
for _, parser := range parsers {
for _, ext := range parser.Extensions() {
extParsers[strings.ToLower(ext)] = parser
}
}
}
// Parser defines an interface for parsering markup file to HTML

2
routers/init.go
View file

@ -19,6 +19,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/mailer"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/external"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/ssh"
@ -75,6 +76,7 @@ func GlobalInit() {
if setting.InstallLock {
highlight.NewContext()
external.RegisterParsers()
markup.Init()
if err := initDBEngine(); err == nil {
log.Info("ORM engine initialization successful!")