summaryrefslogtreecommitdiff
path: root/inc/display.php
diff options
context:
space:
mode:
authorctrlcctrlv <wizardchan@hush.com>2013-08-29 13:43:50 +0000
committerctrlcctrlv <wizardchan@hush.com>2013-08-29 13:43:50 +0000
commit2804c6b775b07b5417d95b160674570600ff047f (patch)
tree17aa60a9755be050a163403bcfaf54dd78c5ba4d /inc/display.php
parentee52dcb5835caa2193570d17e174ee812bb1f2fe (diff)
parent8de81d176cc379687abbfebc3daa72e96068d49a (diff)
Merge remote-tracking branch 'upstream/master' (vichan-devel)
Diffstat (limited to 'inc/display.php')
-rw-r--r--inc/display.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/inc/display.php b/inc/display.php
index 84055d5f..4988cbf5 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -330,6 +330,11 @@ class Post {
$this->modifiers = extract_modifiers($this->body_nomarkup);
+ if ($config['always_regenerate_markup']) {
+ $this->body = $this->body_nomarkup;
+ markup($this->body);
+ }
+
if ($this->mod)
// Fix internal links
// Very complicated regex
@@ -430,6 +435,11 @@ class Thread {
$this->modifiers = extract_modifiers($this->body_nomarkup);
+ if ($config['always_regenerate_markup']) {
+ $this->body = $this->body_nomarkup;
+ markup($this->body);
+ }
+
if ($this->mod)
// Fix internal links
// Very complicated regex