From 341da3cea7b194e74057612efc6fb97cb57f1446 Mon Sep 17 00:00:00 2001 From: Unknwon <u@gogs.io> Date: Fri, 19 Feb 2016 17:39:50 -0500 Subject: [PATCH] Fix inappropriate markdown post process end tag check When <code> is nested inside <pre>, the next end tag token would not able to be the same as outer-most start tag. So we only check outer-most start and end tag token to be the same. --- README.md | 2 +- gogs.go | 2 +- modules/base/markdown.go | 4 ++-- templates/.VERSION | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 34493f5161..415e036b40 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [ -##### Current version: 0.8.38 +##### Current version: 0.8.39 | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/gogs.go b/gogs.go index 8765344ab2..4c9a627dea 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.8.38.0217" +const APP_VER = "0.8.39.0219" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/base/markdown.go b/modules/base/markdown.go index dac51ebc27..10158edd32 100644 --- a/modules/base/markdown.go +++ b/modules/base/markdown.go @@ -303,10 +303,10 @@ OUTER_LOOP: } // If this is the close tag to the outer-most, we are done - if token.Type == html.EndTagToken && strings.EqualFold(tagName, token.Data) { + if token.Type == html.EndTagToken { stackNum-- - if stackNum == 0 { + if stackNum <= 0 && strings.EqualFold(tagName, token.Data) { break } } diff --git a/templates/.VERSION b/templates/.VERSION index 21926c1afb..bbea7d5964 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.38.0217 \ No newline at end of file +0.8.39.0219 \ No newline at end of file