aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-12 16:22:33 -0700
committerfriendica <info@friendica.com>2014-03-12 16:22:50 -0700
commit40b54410b3356c4180d5585d58c29db81179da05 (patch)
treec7c817dae9c1bb5a6dbd8d5c005d7fb2ecc1580c
parentb30ddfaaf907e46537fa82520d76df058938a6b5 (diff)
parentb2e831ce98f3b17cd92adbf9b26283da84cbcffb (diff)
downloadvolse-hubzilla-40b54410b3356c4180d5585d58c29db81179da05.tar.gz
volse-hubzilla-40b54410b3356c4180d5585d58c29db81179da05.tar.bz2
volse-hubzilla-40b54410b3356c4180d5585d58c29db81179da05.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--mod/help.php10
-rw-r--r--view/tpl/help.tpl3
2 files changed, 10 insertions, 3 deletions
diff --git a/mod/help.php b/mod/help.php
index aa0ee8ae6..81ecd6ba9 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -76,14 +76,18 @@ function help_content(&$a) {
$text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text);
if($doctype === 'html')
- return $text;
+ $content = $text;
if($doctype === 'markdown')
- return Markdown($text);
+ $content = Markdown($text);
if($doctype === 'bbcode') {
require_once('include/bbcode.php');
- return bbcode($text);
+ $content = bbcode($text);
}
+ return replace_macros(get_markup_template("help.tpl"), array(
+ '$content' => $content
+ ));
+
}
diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl
new file mode 100644
index 000000000..e01243077
--- /dev/null
+++ b/view/tpl/help.tpl
@@ -0,0 +1,3 @@
+<div id = "help-content" class="generic-content-wrapper">
+{{$content}}
+</div>