diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-08 05:14:03 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-08 05:14:03 +0000 |
commit | 3ff482d390fbfc79d536dccc29c93e473978ea4e (patch) | |
tree | c459f95fcccc141de2e99458eb31cf7ccf34564b | |
parent | 307b9493da770dfb80f47288c193ce4fa4d4dbe3 (diff) | |
download | brdo-3ff482d390fbfc79d536dccc29c93e473978ea4e.tar.gz brdo-3ff482d390fbfc79d536dccc29c93e473978ea4e.tar.bz2 |
#678628 by bdragon and matt2000: Fixed 'More help' links missing from interface.
-rw-r--r-- | includes/menu.inc | 11 | ||||
-rw-r--r-- | modules/help/help.test | 7 |
2 files changed, 12 insertions, 6 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 38168bcc7..361b8dc19 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1493,11 +1493,12 @@ function menu_get_active_help() { // Lookup help for this path. if ($help = $function($router_path, $arg)) { $output .= $help . "\n"; - } - // Add "more help" link on admin pages if the module provides a - // standalone help page. - if ($arg[0] == "admin" && user_access('access administration pages') && module_exists('help') && $function('admin/help#' . $arg[2], $empty_arg) && $help) { - $output .= theme("more_help_link", array('url' => url('admin/help/' . $arg[2]))); + + // Add "more help" link on admin pages if the module provides a + // standalone help page. + if ($arg[0] == "admin" && user_access('access administration pages') && module_exists('help') && $function('admin/help#' . $module, $empty_arg)) { + $output .= theme("more_help_link", array('url' => url('admin/help/' . $module))); + } } } return $output; diff --git a/modules/help/help.test b/modules/help/help.test index 4cc73c181..8e2fed968 100644 --- a/modules/help/help.test +++ b/modules/help/help.test @@ -22,7 +22,7 @@ class HelpTestCase extends DrupalWebTestCase { $this->getModuleList(); // Create users. - $this->big_user = $this->drupalCreateUser(array('access administration pages')); + $this->big_user = $this->drupalCreateUser(array('access administration pages', 'administer permissions')); $this->any_user = $this->drupalCreateUser(array()); } @@ -53,6 +53,11 @@ class HelpTestCase extends DrupalWebTestCase { foreach ($this->modules as $module => $name) { $this->assertLink($name, 0, t('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name))); } + + // Verify that the "More help" links generated by menu.inc work properly. + // Test on an out-of-the-way page. + $this->drupalGet('admin/config/people/roles'); + $this->assertRaw(theme("more_help_link", array('url' => url('admin/help/user'))), t('"More help" link is functional.')); } /** |