aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/nav.php10
-rw-r--r--mod/help.php14
2 files changed, 15 insertions, 9 deletions
diff --git a/include/nav.php b/include/nav.php
index e8c1a2e92..541ab3aed 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -151,15 +151,7 @@ EOT;
if(! get_config('system','hide_help')) {
require_once('mod/help.php');
- $context_help = load_doc_file('doc/context/' . App::$cmd . '/help.html');
- $parentdir = dirname(App::$cmd);
- while (! $context_help && $parentdir !== '.') {
- $context_help = load_doc_file('doc/context/' . $parentdir . '/help.html');
- $parentdir = dirname($parentdir);
- }
- if (! $context_help ) {
- $context_help = '';
- }
+ $context_help = load_context_help();
$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'),'help_nav_btn',$context_help);
}
diff --git a/mod/help.php b/mod/help.php
index a266dbf7f..fb0339cd9 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -84,7 +84,21 @@ function doc_rank_sort($s1,$s2) {
}
+function load_context_help() {
+
+ $path = App::$cmd;
+ $args = App::$argv;
+
+ while($path) {
+ $context_help = load_doc_file('doc/context/' . $path . '/help.html');
+ if($context_help)
+ break;
+ array_pop($args);
+ $path = implode($args,'/');
+ }
+ return $context_help;
+}
function store_doc_file($s) {