admin/quick-n-dirty
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Browse Source 
Conflicts:
	inc/config.php
This commit is contained in:
czaks committed 2013-08-29 07:33:19 -04:00
2 parents b61772361c 738179c766
commit 8de81d176c
6 files changed
+166 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

inc/display.php
+10
View File
@@ -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