diff options
| author | redmatrix <git@macgirvin.com> | 2016-01-17 16:29:32 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-01-17 16:29:32 -0800 |
| commit | 10ed334e8c81d1db4a506716b78ece13dc69266c (patch) | |
| tree | 79a610615bbd6aacff90ff800cad0e08649c8407 /mod/help.php | |
| parent | 9b3b2efe9aa374565c0c67bbc67c36f9c99d3add (diff) | |
| download | volse-hubzilla-10ed334e8c81d1db4a506716b78ece13dc69266c.tar.gz volse-hubzilla-10ed334e8c81d1db4a506716b78ece13dc69266c.tar.bz2 volse-hubzilla-10ed334e8c81d1db4a506716b78ece13dc69266c.zip | |
various issues from the forums
Diffstat (limited to 'mod/help.php')
| -rw-r--r-- | mod/help.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/help.php b/mod/help.php index c4549a2bd..e1c6fede8 100644 --- a/mod/help.php +++ b/mod/help.php @@ -157,7 +157,7 @@ function help_content(&$a) { $path = trim(substr($dirname,4),'/'); $o .= '<li><a href="help/' . (($path) ? $path . '/' : '') . $fname . '" >' . ucwords(str_replace('_',' ',notags($fname))) . '</a><br />' . - str_replace('$Projectname',PLATFORM_NAME,substr($rr['text'],0,200)) . '...<br /><br /></li>'; + str_replace('$Projectname',get_platform_name(),substr($rr['text'],0,200)) . '...<br /><br /></li>'; } $o .= '</ul>'; @@ -229,6 +229,8 @@ function help_content(&$a) { if($doctype === 'bbcode') { require_once('include/bbcode.php'); $content = bbcode($text); + // bbcode retargets external content to new windows. This content is internal. + $content = str_replace(' target="_blank"','',$content); } $content = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $content); @@ -248,7 +250,9 @@ function preg_callback_help_include($matches) { if(preg_match('/\.bb$/', $matches[1]) || preg_match('/\.txt$/', $matches[1])) { require_once('include/bbcode.php'); $include = bbcode($include); - } elseif(preg_match('/\.md$/', $matches[1])) { + $include = str_replace(' target="_blank"','',$include); + } + elseif(preg_match('/\.md$/', $matches[1])) { require_once('library/markdown.php'); $include = Markdown($include); } |