Merge remote-tracking branch 'upstream/master'

1 files changed, 24 insertions, 3 deletions

diff --git a/mod/help.php b/mod/help.php
index e78f9e61c..cd2dfd87e 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -32,6 +32,8 @@ function help_content(&$a) {
 
 	global $lang;
 
+	$doctype = 'markdown';
+
 	require_once('library/markdown.php');
 
 	$text = '';
@@ -41,6 +43,19 @@ function help_content(&$a) {
 		$a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1)));
 	}
 	if(! $text) {
+		$text = load_doc_file('doc/' . $a->argv[1] . '.bb');
+		if($text)
+			$doctype = 'bbcode';
+		$a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1)));
+	}
+	if(! $text) {
+		$text = load_doc_file('doc/' . $a->argv[1] . '.html');
+		if($text)
+			$doctype = 'html';
+		$a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1)));
+	}
+
+	if(! $text) {
 		$text = load_doc_file('doc/Site.md');
 		$a->page['title'] = t('Help');
 	}
@@ -58,9 +73,15 @@ function help_content(&$a) {
 	}
 
 	$text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text);
-	
-	
-	return Markdown($text);
+
+	if($doctype === 'html')
+		return $text;
+	if($doctype === 'markdown')	
+		return Markdown($text);
+	if($doctype === 'bbcode') {
+		require_once('include/bbcode.php');
+		return bbcode($text);
+	} 
 
 }