From a4299fe4a659fe0e22f8e11e90096f1f66c3345c Mon Sep 17 00:00:00 2001
From: Savetheinternet <savetheinternet@n0v4.com>
Date: Fri, 26 Nov 2010 01:41:35 -0800
Subject: Wiki markup addition and ability to disable/enable it

---
 inc/functions.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'inc/functions.php')

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);
 	}
 
-- 
cgit v1.3