harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #665 from zzottel/master

Browse Source 
make bbcode/html includes work in markdown help pages and vice versa
This commit is contained in:
RedMatrix 2014-10-25 07:54:32 +11:00
commit e0dd68d77a
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mod/help.php
View File

@ -34,8 +34,6 @@ function help_content(&$a) {
$doctype = 'markdown'; $doctype = 'markdown';
require_once('library/markdown.php');
$text = ''; $text = '';
if(argc() > 1) { if(argc() > 1) {
@ -73,17 +71,22 @@ function help_content(&$a) {
)); ));
} }
$text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text);
if($doctype === 'html') if($doctype === 'html')
$content = $text; $content = $text;
if($doctype === 'markdown') if($doctype === 'markdown') {
require_once('library/markdown.php');
# escape #include tags
$text = preg_replace('/#include/ism', '%%include', $text);
$content = Markdown($text); $content = Markdown($text);
$content = preg_replace('/%%include/ism', '#include', $content);
}
if($doctype === 'bbcode') { if($doctype === 'bbcode') {
require_once('include/bbcode.php'); require_once('include/bbcode.php');
$content = bbcode($text); $content = bbcode($text);
} }
$content = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $content);
return replace_macros(get_markup_template("help.tpl"), array( return replace_macros(get_markup_template("help.tpl"), array(
'$content' => $content '$content' => $content
)); ));
@ -93,8 +96,17 @@ function help_content(&$a) {
function preg_callback_help_include($matches) { function preg_callback_help_include($matches) {
if($matches[1]) if($matches[1]) {
return str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); $include = str_replace($matches[0],load_doc_file($matches[1]),$matches[0]);
if(preg_match('/\.bb$/', $matches[1])) {
require_once('include/bbcode.php');
$include = bbcode($include);
} elseif(preg_match('/\.md$/', $matches[1])) {
require_once('library/markdown.php');
$include = Markdown($include);
}
return $include;
}
} }