diff options
| author | czaks <marcin@6irc.net> | 2013-08-29 07:33:19 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-29 07:33:19 -0400 |
| commit | 8de81d176cc379687abbfebc3daa72e96068d49a (patch) | |
| tree | 87e79f53ea13449b76944dd93a17e2a10d56da91 /inc/display.php | |
| parent | b61772361cd124c665a9356630936d8f8b4a352b (diff) | |
| parent | 738179c766953fa45670e451875210c6874a41f2 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
inc/config.php
Diffstat (limited to 'inc/display.php')
| -rw-r--r-- | inc/display.php | 10 |
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 |