add a switch to the Markdown parser for using hard line breaks (issue 3592)

[friendica.git] / mod / help.php

diff --git a/mod/help.php b/mod/help.php
index 5465d3e900f9827438de3c60fbf492f920914c01..95fe91c38bc89735e14ae29bf5d139025d949ede 100644 (file)
--- a/mod/help.php
+++ b/mod/help.php
@@ -1,4 +1,7 @@
 <?php
+
+use Friendica\App;
+
 require_once('library/markdown.php');
 
 if (!function_exists('load_doc_file')) {
@@ -18,7 +21,7 @@ if (!function_exists('load_doc_file')) {
 
 }
 
-function help_content(&$a) {
+function help_content(App $a) {
 
        nav_set_selected('help');
 
@@ -46,7 +49,7 @@ function help_content(&$a) {
                $filename = "Home";
                $a->page['title'] = t('Help');
        } else {
-               $a->page['aside'] = Markdown($home);
+               $a->page['aside'] = Markdown($home, false);
        }
 
        if (!strlen($text)) {
@@ -57,12 +60,12 @@ function help_content(&$a) {
                                ));
        }
 
-       $html = Markdown($text);
+       $html = Markdown($text, false);
 
        if ($filename !== "Home") {
                // create TOC but not for home
                $lines = explode("\n", $html);
-               $toc="<style>aside ul {padding-left: 1em;}</style><h2>TOC</h2><ul id='toc'>";
+               $toc="<style>aside ul {padding-left: 1em;}aside h1{font-size:2em}</style><h2>TOC</h2><ul id='toc'>";
                $lastlevel=1;
                $idnum = array(0,0,0,0,0,0,0);
                foreach($lines as &$line){
@@ -77,17 +80,17 @@ function help_content(&$a) {
                                        if ($level>$lastlevel) $toc.="<ul>";
                                        $idnum[$level]++;
                                        $id = implode("_", array_slice($idnum,1,$level));
-                                       $href = $a->get_baseurl()."/help/{$filename}#{$id}";
+                                       $href = App::get_baseurl()."/help/{$filename}#{$id}";
                                        $toc .= "<li><a href='{$href}'>".strip_tags($line)."</a></li>";
                                        $line = "<a name='{$id}'></a>".$line;
                                        $lastlevel = $level;
                                }
                        }
                }
-               for($k=1;$k<$lastlevel; $k++) $toc.="</ul>";
+               for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
                $html = implode("\n",$lines);
 
-               $a->page['aside'] = $toc.$a->page['aside'];
+               $a->page['aside'] = '<section class="help-aside-wrapper">' . $toc . $a->page['aside'] . '</section>';
        }
 
        $html = "