Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.243
diff -u -p -r1.243 locale.module
--- modules/locale/locale.module	5 Jul 2009 18:00:09 -0000	1.243
+++ modules/locale/locale.module	18 Jul 2009 01:45:24 -0000
@@ -76,8 +76,7 @@ function locale_menu() {
    'position' => 'left',
    'weight' => -7,
    'page callback' => 'system_admin_menu_block_page',
-   'access callback' => 'system_admin_menu_block_access',
-   'access arguments' => array('admin/international', 'access administration pages'),
+   'access arguments' => array('access administration pages'),
   );
   $items['admin/international/language'] = array(
     'title' => 'Languages',
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.723
diff -u -p -r1.723 system.module
--- modules/system/system.module	16 Jul 2009 10:44:21 -0000	1.723
+++ modules/system/system.module	18 Jul 2009 01:45:31 -0000
@@ -513,8 +513,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/content', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
   );
 
   // Menu items that are basically just menu blocks.
@@ -524,8 +523,7 @@ function system_menu() {
     'position' => 'right',
     'weight' => -5,
     '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'),
   );
   $items['admin/build'] = array(
     'title' => 'Site building',
@@ -533,8 +531,7 @@ function system_menu() {
     'position' => 'right',
     'weight' => -10,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/build', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
   );
   // Themes.
   $items['admin/build/themes'] = array(
@@ -609,8 +606,7 @@ function system_menu() {
     'position' => 'right',
     'weight' => -7,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/development', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
   );
 
   // Actions.
@@ -760,8 +756,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',
   );
@@ -1167,25 +1162,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() {