summaryrefslogtreecommitdiff
path: root/inc/config.php
diff options
context:
space:
mode:
authorMichael Foster <savetheinternet@tinyboard.org>2013-07-31 18:29:09 -0400
committerMichael Foster <savetheinternet@tinyboard.org>2013-07-31 18:29:09 -0400
commit4891735c49ee7879d0f299d03ebfbe361f3cc73d (patch)
treea77d63704505ba84d49f75a655bd60370b94c8e3 /inc/config.php
parent6317a7015272d770770c000c69271ff73cf55007 (diff)
Fix issue #72
Diffstat (limited to 'inc/config.php')
-rw-r--r--inc/config.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/config.php b/inc/config.php
index 1fd00a3d..6f2371ec 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -381,10 +381,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(