From e1812b3353b6fe735e9a0dacf7e48b6eeb71d4cd Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 12 Jan 2010 06:09:04 +0000
Subject: #678628 follow-up by jhodgdon: Remove buggy and incorrect 'More Help'
 functionality from Help module.

---
 includes/menu.inc        | 6 ------
 modules/help/help.test   | 5 -----
 modules/node/node.module | 4 ----
 3 files changed, 15 deletions(-)

diff --git a/includes/menu.inc b/includes/menu.inc
index 5e4ee1001..cc7fe485c 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1495,12 +1495,6 @@ 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#' . $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 e15bd15e7..9edde2253 100644
--- a/modules/help/help.test
+++ b/modules/help/help.test
@@ -53,11 +53,6 @@ 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.'));
   }
 
   /**
diff --git a/modules/node/node.module b/modules/node/node.module
index e6c176c6a..d4f77f14b 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -98,10 +98,6 @@ function node_help($path, $arg) {
       $output .= '</dl>';
       return $output;
 
-    case 'admin/content':
-      // Return a non-null value so that the 'more help' link is shown.
-      return ' ';
-
     case 'admin/structure/types/add':
       return '<p>' . t('Individual content types can have different fields, behaviors, and permissions assigned to them.') . '</p>';
 
-- 
cgit v1.2.3