Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.963 diff -u -r1.963 user.module --- modules/user/user.module 9 Feb 2009 07:36:15 -0000 1.963 +++ modules/user/user.module 4 Mar 2009 22:21:50 -0000 @@ -672,7 +672,7 @@ ), 'cancel account' => array( 'title' => t('Cancel account'), - 'description' => t('Remove or disable own user account and unpublish, anonymize, or remove own submissions depending on the configured user settings.', array('@user-settings-url' => url('admin/user/settings'))), + 'description' => t('Remove or disable own user account and unpublish, anonymize, or remove own submissions depending on the configured user settings.', array('@user-settings-url' => url('admin/user/user/settings'))), ), 'select account cancellation method' => array( 'title' => t('Select method for cancelling own account'), @@ -1219,12 +1219,13 @@ 'access arguments' => array('administer users'), 'type' => MENU_LOCAL_TASK, ); - $items['admin/user/settings'] = array( + $items['admin/user/user/settings'] = array( 'title' => 'User settings', 'description' => 'Configure default behavior of users, including registration requirements, e-mails, and user pictures.', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_settings'), 'access arguments' => array('administer users'), + 'type' => MENU_LOCAL_TASK, ); // Permission administration pages. Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1024 diff -u -r1.1024 node.module --- modules/node/node.module 13 Feb 2009 02:27:59 -0000 1.1024 +++ modules/node/node.module 4 Mar 2009 22:21:50 -0000 @@ -52,13 +52,13 @@ // Remind site administrators about the {node_access} table being flagged // for rebuild. We don't need to issue the message on the confirm form, or // while the rebuild is being processed. - if ($path != 'admin/content/node-settings/rebuild' && $path != 'batch' && strpos($path, '#') === FALSE + if ($path != 'admin/content/node/settings/rebuild' && $path != 'batch' && strpos($path, '#') === FALSE && user_access('access administration pages') && node_access_needs_rebuild()) { - if ($path == 'admin/content/node-settings') { + if ($path == 'admin/content/node/settings') { $message = t('The content access permissions need to be rebuilt.'); } else { - $message = t('The content access permissions need to be rebuilt. Please visit this page.', array('@node_access_rebuild' => url('admin/content/node-settings/rebuild'))); + $message = t('The content access permissions need to be rebuilt. Please visit this page.', array('@node_access_rebuild' => url('admin/content/node/settings/rebuild'))); } drupal_set_message($message, 'error'); } @@ -67,7 +67,7 @@ case 'admin/help#node': $output = '

' . t('The node module manages content on your site, and stores all posts (regardless of type) as a "node" . In addition to basic publishing settings, including whether the post has been published, promoted to the site front page, or should remain present (or sticky) at the top of lists, the node module also records basic information about the author of a post. Optional revision control over edits is available. For additional functionality, the node module is often extended by other modules.') . '

'; $output .= '

' . t('Though each post on your site is a node, each post is also of a particular content type. Content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Each content type may have different default settings for Publishing options and other workflow controls. By default, the two content types in a standard Drupal installation are Page and Story. Use the content types page to add new or edit existing content types. Additional content types also become available as you enable additional core, contributed and custom modules.', array('@content-type' => url('admin/build/types'))) . '

'; - $output .= '

' . t('The administrative content page allows you to review and manage your site content. The post settings page sets certain options for the display of posts. The node module makes a number of permissions available for each content type, which may be set by role on the permissions page.', array('@content' => url('admin/content/node'), '@post-settings' => url('admin/content/node-settings'), '@permissions' => url('admin/user/permissions'))) . '

'; + $output .= '

' . t('The administrative content page allows you to review and manage your site content. The post settings page sets certain options for the display of posts. The node module makes a number of permissions available for each content type, which may be set by role on the permissions page.', array('@content' => url('admin/content/node'), '@post-settings' => url('admin/content/node/settings'), '@permissions' => url('admin/user/permissions'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Node module.', array('@node' => 'http://drupal.org/handbook/modules/node/')) . '

'; return $output; case 'admin/content/node': @@ -1692,14 +1692,15 @@ 'weight' => -10, ); - $items['admin/content/node-settings'] = array( + $items['admin/content/node/settings'] = array( 'title' => 'Post settings', 'description' => 'Control posting behavior, such as teaser length, requiring previews before posting, and the number of posts on the front page.', 'page callback' => 'drupal_get_form', 'page arguments' => array('node_configure'), 'access arguments' => array('administer nodes'), + 'type' => MENU_LOCAL_TASK, ); - $items['admin/content/node-settings/rebuild'] = array( + $items['admin/content/node/settings/rebuild'] = array( 'title' => 'Rebuild permissions', 'page arguments' => array('node_configure_rebuild_confirm'), // Any user than can potentially trigger a node_access_needs_rebuild(TRUE) Index: modules/node/node.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v retrieving revision 1.38 diff -u -r1.38 node.admin.inc --- modules/node/node.admin.inc 3 Feb 2009 18:55:30 -0000 1.38 +++ modules/node/node.admin.inc 4 Mar 2009 22:21:49 -0000 @@ -64,7 +64,7 @@ * Form button submit callback. */ function node_configure_access_submit($form, &$form_state) { - $form_state['redirect'] = 'admin/content/node-settings/rebuild'; + $form_state['redirect'] = 'admin/content/node/settings/rebuild'; } /** @@ -72,7 +72,7 @@ */ function node_configure_rebuild_confirm() { return confirm_form(array(), t('Are you sure you want to rebuild the permissions on site content?'), - 'admin/content/node-settings', t('This action rebuilds all permissions on site content, and may be a lengthy process. This action cannot be undone.'), t('Rebuild permissions'), t('Cancel')); + 'admin/content/node/settings', t('This action rebuilds all permissions on site content, and may be a lengthy process. This action cannot be undone.'), t('Rebuild permissions'), t('Cancel')); } /** @@ -80,7 +80,7 @@ */ function node_configure_rebuild_confirm_submit($form, &$form_state) { node_access_rebuild(TRUE); - $form_state['redirect'] = 'admin/content/node-settings'; + $form_state['redirect'] = 'admin/content/node/settings'; } /**