? 420358-followup-D7.patch
? 420358-followup-D7_0.patch
? 420358-followup-D7_1.patch
? 420358-followup-D7_2.patch
? sites/all/modules/contrib
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.371
diff -u -p -r1.371 menu.inc
--- includes/menu.inc	4 Jan 2010 04:47:24 -0000	1.371
+++ includes/menu.inc	8 Jan 2010 04:35:38 -0000
@@ -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;
Index: modules/help/help.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.test,v
retrieving revision 1.15
diff -u -p -r1.15 help.test
--- modules/help/help.test	24 Aug 2009 00:14:20 -0000	1.15
+++ modules/help/help.test	8 Jan 2010 04:35:38 -0000
@@ -22,7 +22,7 @@ class HelpTestCase extends DrupalWebTest
     $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 DrupalWebTest
     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.'));
   }
 
   /**