summaryrefslogtreecommitdiff
path: root/inc/functions.php
diff options
context:
space:
mode:
authorSavetheinternet <savetheinternet@n0v4.com>2010-11-26 01:41:35 -0800
committerSavetheinternet <savetheinternet@n0v4.com>2010-11-26 01:41:35 -0800
commita4299fe4a659fe0e22f8e11e90096f1f66c3345c (patch)
tree48b8d4f317a86f26ccea87f85a123c7cc8a4e538 /inc/functions.php
parent5fd0d21d5664d54d436e26c5ff68fb8ee79a423c (diff)
Wiki markup addition and ability to disable/enable it
Diffstat (limited to 'inc/functions.php')
-rw-r--r--inc/functions.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/inc/functions.php b/inc/functions.php
index 0c1210e5..4e03a531 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -209,10 +209,13 @@
if(MARKUP_URLS)
$body = preg_replace(URL_REGEX, "<a href=\"$0\">$0</a>", $body);
-
$body = preg_replace("/(^|\n)([\s]+)?(&gt;)([^\n]+)?($|\n)/m", '$1$2<span class="quote">$3$4</span>$5', $body);
- $body = preg_replace("/(^|\n)==(.+?)==\n?/m", "<h2>$2</h2>", $body);
- $body = preg_replace("/'''(.+?)'''/m", "<strong>$1</strong>", $body);
+
+ if(WIKI_MARKUP) {
+ $body = preg_replace("/(^|\n)==(.+?)==\n?/m", "<h2>$2</h2>", $body);
+ $body = preg_replace("/'''(.+?)'''/m", "<strong>$1</strong>", $body);
+ $body = preg_replace("/''(.+?)''/m", "<em>$1</em>", $body);
+ }
$body = preg_replace("/\n/", '<br/>', $body);
}