- Patch #34755 by chx et al: faster menu system. HEAD is temporary broken and there is no upgrade path yet.

1 files changed, 13 insertions, 17 deletions

diff --git a/modules/help/help.module b/modules/help/help.module
index 79fd232a1..399110041 100644
--- a/modules/help/help.module
+++ b/modules/help/help.module
@@ -9,24 +9,20 @@
 /**
  * Implementation of hook_menu().
  */
-function help_menu($may_cache) {
-  $items = array();
+function help_menu() {
+  $items['admin/help'] = array(
+    'title' => t('Help'),
+    'page callback' => 'help_main',
+    'access arguments' => array('access administration pages'),
+    'weight' => 9,
+  );
 
-  if ($may_cache) {
-    $admin_access = user_access('access administration pages');
-
-    $items[] = array('path' => 'admin/help', 'title' => t('Help'),
-      'callback' => 'help_main',
-      'access' => $admin_access,
-      'weight' => 9);
-
-    foreach (module_implements('help', TRUE) as $module) {
-      $items[] = array('path' => 'admin/help/' . $module,
-        'title' => t($module),
-        'callback' => 'help_page',
-        'type' => MENU_CALLBACK,
-        'access' => $admin_access);
-    }
+  foreach (module_implements('help', TRUE) as $module) {
+    $items['admin/help/'. $module] = array(
+      'title' => t($module),
+      'page callback' => 'help_page',
+      'type' => MENU_CALLBACK,
+    );
   }
 
   return $items;