THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

Fix wrong init dependency on markup extensions (#7038) (#7074)

* fix wrong init dependency on markup extensions
tags/v1.8.2
Lunny Xiao techknowlogick 5 months ago
parent
commit
31ad8b7026
4 changed files with 12 additions and 3 deletions
  1. +0
    -3
      cmd/web.go
  2. +2
    -0
      contrib/pr/checkout.go
  3. +8
    -0
      modules/markup/markup.go
  4. +2
    -0
      routers/init.go

+ 0
- 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"
@@ -120,8 +119,6 @@ func runWeb(ctx *cli.Context) error {

routers.GlobalInit()

external.RegisterParsers()

m := routes.NewMacaron()
routes.RegisterRoutes(m)



+ 2
- 0
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
- 0
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
- 0
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!")


Loading…
Cancel
Save