3 files changed, 11 insertions, 7 deletions
diff --git a/modules/base/markdown.go b/modules/base/markdown.go
index d06e1338..03f1287c 100644
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@ -198,7 +198,6 @@ func RenderRawMarkdown(body []byte, urlPrefix string) []byte {
 	extensions |= blackfriday.EXTENSION_FENCED_CODE
 	extensions |= blackfriday.EXTENSION_AUTOLINK
 	extensions |= blackfriday.EXTENSION_STRIKETHROUGH
-	extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK
 	extensions |= blackfriday.EXTENSION_SPACE_HEADERS
 	extensions |= blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK
 
diff --git a/modules/base/template.go b/modules/base/template.go
index 0d682545..7f575388 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -131,12 +131,13 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
 	"LoadTimes": func(startTime time.Time) string {
 		return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms"
 	},
-	"AvatarLink": AvatarLink,
-	"Safe":       Safe,
-	"Str2html":   Str2html,
-	"TimeSince":  TimeSince,
-	"FileSize":   FileSize,
-	"Subtract":   Subtract,
+	"AvatarLink":   AvatarLink,
+	"Safe":         Safe,
+	"Str2html":     Str2html,
+	"TimeSince":    TimeSince,
+	"RawTimeSince": RawTimeSince,
+	"FileSize":     FileSize,
+	"Subtract":     Subtract,
 	"Add": func(a, b int) int {
 		return a + b
 	},
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 2435ebe0..16759f21 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -321,6 +321,10 @@ func timeSince(then time.Time, lang string) string {
 	}
 }
 
+func RawTimeSince(t time.Time, lang string) string {
+	return timeSince(t, lang)
+}
+
 // TimeSince calculates the time interval and generate user-friendly string.
 func TimeSince(t time.Time, lang string) template.HTML {
 	return template.HTML(fmt.Sprintf(`<span class="time-since" title="%s">%s</span>`, t.Format(setting.TimeFormat), timeSince(t, lang)))