? 301902_node_admin_9.patch
? 460320.patch
? 471018_machine_readable_name-43.patch
? 555712-toolbar-toggle_2.patch
? :w
? autocomplete.png
? clean-urls.patch
? description.patch
? draft.patch
? draft_16.patch
? drupal-theme-optimization-523682-17.patch
? drupal.machine.patch
? entity-week.patch
? entity.patch
? entity2days.patch
? entity_12.patch
? entity_13.patch
? entity_14.patch
? entity_15.patch
? entity_17.patch
? entity_18.patch
? entity_19.patch
? entity_19.patch.1
? entity_20.patch
? entity_today.patch
? field_ui_4.patch
? field_ui_7.patch
? foo.test
? forum.patch
? forum_33.patch
? forum_topic_navigation.patch
? forumihateyou.patch
? head.png
? load2_0.patch
? load2_0.patch.1
? no-description.png
? node_admin.patch
? node_admin_9.patch
? non-admin.png
? not-admin.png
? patch.png
? path.patch
? php.patch
? profile.patch
? profile_fields.patch
? profile_fields.patch.1
? queries.png
? registry_remove.patch
? registry_rip_11.patch
? remove_registry_0.patch
? remove_registry_0.patch.1
? revert.patch
? revert_0.patch
? schema_versions-521838-46.patch
? slimmer_taxonomy.patch
? system_block_access_revert_1.patch
? taxonomy-autocomplete_526122_34.patch
? taxonomy-autocomplete_526122_34.patch.1
? taxonomy_diet.patch
? taxonomy_diet_1.patch
? taxonomy_diet_2.patch
? taxonomy_diet_2.patch.1
? taxonomy_diet_3.patch
? taxonomy_fields.patch
? taxonomy_upgrade.patch
? theme-processors_for_function_implementations-400292-38.patch
? theme.php
? toolbar-distance.png
? toolbar.patch
? toolbar_cache.patch
? tracker.patch
? tracker_24.patch
? tracker_25.patch
? tracker_26.patch
? tracker_28.patch
? translatable_fields-367595-220.patch
? includes/.common.inc.swp
? includes/.path.inc.swp
? modules/field_ui
? modules/toolbar/yar.patch
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.777
diff -u -p -r1.777 system.module
--- modules/system/system.module	26 Aug 2009 10:53:45 -0000	1.777
+++ modules/system/system.module	26 Aug 2009 16:46:46 -0000
@@ -567,8 +567,7 @@ function system_menu() {
     'position' => 'right',
     'weight' => -2,
     'page callback' => 'system_settings_overview',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/settings', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/structure'] = array(
@@ -577,8 +576,7 @@ function system_menu() {
     'position' => 'right',
     'weight' => -8,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/structure', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   // Appearance.
@@ -744,8 +742,7 @@ function system_menu() {
     'position' => 'left',
     'weight' => 10,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/config/development', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/config/development/maintenance'] = array(
@@ -770,8 +767,7 @@ function system_menu() {
     'position' => 'left',
     'weight' => 10,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/config/media', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/config/media/file-system'] = array(
@@ -794,8 +790,7 @@ function system_menu() {
     'title' => 'Web services',
     'description' => 'Tools related to web services.',
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/config/services', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/config/services/rss-publishing'] = array(
@@ -820,8 +815,7 @@ function system_menu() {
     'position' => 'left',
     'weight' => -7,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/config/regional', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/config/regional/settings'] = array(
@@ -844,8 +838,7 @@ function system_menu() {
     'title' => 'Search and metadata',
     'description' => 'Local site search, metadata and SEO.',
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/config/search', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/config/search/clean-urls'] = array(
@@ -880,8 +873,7 @@ function system_menu() {
     'title' => 'Reports',
     'description' => 'View reports from system logs and other status information.',
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/reports', 'access site reports'),
+    'access arguments' => array('access site reports'),
     'weight' => 5,
     'position' => 'left',
     'file' => 'system.admin.inc',
@@ -1328,25 +1320,6 @@ function _system_themes_access($theme) {
 }
 
 /**
- * Menu item access callback - hides empty system settings overview pages.
- *
- * @param $path
- *   The path of the menu item to check for child menu entries.
- * @param $string
- *   The permission, such as "administer nodes", being checked for.
- * @return
- *   Boolean TRUE if the current user has the requested permission and the
- *   current menu item has children.
- */
-function system_admin_menu_block_access($path, $permission) {
-  if (!user_access($permission)) {
-    return FALSE;
-  }
-  $content = system_admin_menu_block(array('path' => $path));
-  return !empty($content);
-}
-
-/**
  * Implement hook_filetransfer_backends().
  */
 function system_filetransfer_backends() {
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1031
diff -u -p -r1.1031 user.module
--- modules/user/user.module	25 Aug 2009 21:53:48 -0000	1.1031
+++ modules/user/user.module	26 Aug 2009 16:46:46 -0000
@@ -1316,8 +1316,7 @@ function user_menu() {
    'description' => 'Configure user accounts, roles and permissions.',
    'position' => 'right',
    'page callback' => 'system_admin_menu_block_page',
-   'access callback' => 'system_admin_menu_block_access',
-   'access arguments' => array('admin/config/people', 'access administration pages'),
+   'access arguments' => array('access administration pages'),
   );
   $items['admin/config/people/accounts'] = array(
     'title' => 'Account settings',