ok, now i think i got that right, if error, then raw, else rendered

Co-Authored-By: silverwind <[email protected]>

Author: Caellion

modules/templates/helper.go

@@ -630,15 +630,15 @@ func RenderMarkup(markupType string, raw string) template.HTML {
 	if markupType == "markdown" {
 		if renderedContent, err = markdown.RenderString(&markup.RenderContext{}, raw); err != nil {
 			log.Warn("Markdown2html: Invalid markdown? %v", err)
-			return template.HTML(html.EscapeString(renderedContent))
+			return template.HTML(html.EscapeString(raw))
 		}
-		return template.HTML(markup.Sanitize(raw))
+		return template.HTML(markup.Sanitize(renderedContent))
 	} else if markupType == "markup" {
 		if renderedContent, err = markup.RenderString(&markup.RenderContext{}, raw); err != nil {
 			log.Warn("Markdown2html: Invalid markup? %v", err)
-			return template.HTML(html.EscapeString(renderedContent))
+			return template.HTML(html.EscapeString(raw))
 		}
-		return template.HTML(markup.Sanitize(raw))
+		return template.HTML(markup.Sanitize(renderedContent))
 	}
 
 	return template.HTML(fmt.Sprintf(`Unsupported markup: :%s:`, markupType))