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

1 files changed, 22 insertions, 22 deletions

diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module
index f90703608..a70336427 100644
--- a/modules/drupal/drupal.module
+++ b/modules/drupal/drupal.module
@@ -336,28 +336,28 @@ function drupal_auth($username, $password, $server = FALSE) {
 /**
  * Implementation of hook_menu().
  */
-function drupal_menu($may_cache) {
-  $items = array();
-  if ($may_cache) {
-    $items[] = array('path' => 'admin/settings/sites-registry',
-      'title' => t('Sites registry'),
-      'description' => t('Register with another Drupal site (drupal.org by default) for statistics sharing, or set up your server to be a central server for registrations.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('drupal_sites_registry_settings'),
-      'access' => user_access('administer site configuration'));
-    $items[] = array('path' => 'admin/settings/distributed-authentication',
-      'title' => t('Distributed authentication'),
-      'description' => t('Allow your site to accept logins from other Drupal sites such as drupal.org.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('drupal_distributed_authentication_settings'),
-      'access' => user_access('administer site configuration'));;
-
-    if (variable_get('drupal_authentication_service', 0)) {
-      $items[] = array('path' => 'drupal', 'title' => t('Drupal'),
-        'callback' => 'drupal_page_help', 'access' => TRUE,
-        'type' => MENU_SUGGESTED_ITEM
-      );
-    }
+function drupal_menu() {
+  $items['admin/settings/sites-registry'] = array(
+    'title' => t('Sites registry'),
+    'description' => t('Register with another Drupal site (drupal.org by default) for statistics sharing, or set up your server to be a central server for registrations.'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('drupal_sites_registry_settings'),
+    'access arguments' => array('administer site configuration'),
+  );
+  $items['admin/settings/distributed-authentication'] = array(
+    'title' => t('Distributed authentication'),
+    'description' => t('Allow your site to accept logins from other Drupal sites such as drupal.org.'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('drupal_distributed_authentication_settings'),
+    'access arguments' => array('administer site configuration'),
+  );
+  if (variable_get('drupal_authentication_service', 0)) {
+    $items['drupal'] = array(
+      'title' => t('Drupal'),
+      'page callback' => 'drupal_page_help',
+      'access callback' => TRUE,
+      'type' => MENU_SUGGESTED_ITEM,
+    );
   }
   return $items;
 }