diff options
| author | czaks <marcin@6irc.net> | 2013-07-31 19:25:04 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-31 19:25:04 -0400 |
| commit | b35ea557634af42c3f63b7219cd1bfd46cf486a6 (patch) | |
| tree | 0530d3025764e09265fa934f8ae1e906efcad7c6 /inc/config.php | |
| parent | dc9df2b9b3d2994bce02474503b3ebbb56c38ece (diff) | |
| parent | 6bbe407e18681f2812db4345036bb5ae639f5973 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
templates/thread.html
Diffstat (limited to 'inc/config.php')
| -rw-r--r-- | inc/config.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/config.php b/inc/config.php index 38a17e03..0ff8ad4c 100644 --- a/inc/config.php +++ b/inc/config.php @@ -386,10 +386,10 @@ */ // "Wiki" markup syntax ($config['wiki_markup'] in pervious versions): - $config['markup'][] = array("/'''(.+?)'''/", "<strong>\$1</strong>"); - $config['markup'][] = array("/''(.+?)''/", "<em>\$1</em>"); - $config['markup'][] = array("/\*\*(.+?)\*\*/", "<span class=\"spoiler\">\$1</span>"); - $config['markup'][] = array("/^[ |\t]*==(.+?)==[ |\t]*$/m", "<span class=\"heading\">\$1</span>"); + $config['markup'][] = array("/'''([^<]+?)'''/", "<strong>\$1</strong>"); + $config['markup'][] = array("/''([^<]+?)''/", "<em>\$1</em>"); + $config['markup'][] = array("/\*\*([^<]+?)\*\*/", "<span class=\"spoiler\">\$1</span>"); + $config['markup'][] = array("/^[ |\t]*==([^<]+?)==[ |\t]*$/m", "<span class=\"heading\">\$1</span>"); // Highlight PHP code wrapped in <code> tags (PHP 5.3.0+) // $config['markup'][] = array( |