strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix undefined $a variable in Module\Help

Browse source
This commit is contained in:
Hypolite Petovan 2019-05-13 00:55:49 -04:00
parent 6071fe81b4
commit c2062fe594
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Module/Help.php
View file

@ -21,35 +21,35 @@ class Help extends BaseModule
$text = ''; $text = '';
$filename = ''; $filename = '';
$app = self::getApp(); $a = self::getApp();
$config = $app->getConfig(); $config = $a->getConfig();
$lang = $config->get('system', 'language'); $lang = $config->get('system', 'language');
// @TODO: Replace with parameter from router // @TODO: Replace with parameter from router
if ($app->argc > 1) { if ($a->argc > 1) {
$path = ''; $path = '';
// looping through the argv keys bigger than 0 to build // looping through the argv keys bigger than 0 to build
// a path relative to /help // a path relative to /help
for ($x = 1; $x < $app->argc; $x ++) { for ($x = 1; $x < $a->argc; $x ++) {
if (strlen($path)) { if (strlen($path)) {
$path .= '/'; $path .= '/';
} }
$path .= $app->getArgumentValue($x); $path .= $a->getArgumentValue($x);
} }
$title = basename($path); $title = basename($path);
$filename = $path; $filename = $path;
$text = self::loadDocFile('doc/' . $path . '.md', $lang); $text = self::loadDocFile('doc/' . $path . '.md', $lang);
$app->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title)); $a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title));
} }
$home = self::loadDocFile('doc/Home.md', $lang); $home = self::loadDocFile('doc/Home.md', $lang);
if (!$text) { if (!$text) {
$text = $home; $text = $home;
$filename = "Home"; $filename = "Home";
$app->page['title'] = L10n::t('Help'); $a->page['title'] = L10n::t('Help');
} else { } else {
$app->page['aside'] = Markdown::convert($home, false); $a->page['aside'] = Markdown::convert($home, false);
} }
if (!strlen($text)) { if (!strlen($text)) {
@ -85,7 +85,7 @@ class Help extends BaseModule
$idNum[$level] ++; $idNum[$level] ++;
$id = implode("_", array_slice($idNum, 1, $level)); $id = implode("_", array_slice($idNum, 1, $level));
$href = $app->getBaseURL() . "/help/{$filename}#{$id}"; $href = $a->getBaseURL() . "/help/{$filename}#{$id}";
$toc .= "<li><a href='{$href}'>" . strip_tags($line) . "</a></li>"; $toc .= "<li><a href='{$href}'>" . strip_tags($line) . "</a></li>";
$line = "<a name='{$id}'></a>" . $line; $line = "<a name='{$id}'></a>" . $line;
$lastLevel = $level; $lastLevel = $level;