- Patch #508570 by quicksketch, sun | pwolanin, bec: restore URL consistency for node types and menus.

3 files changed, 13 insertions, 13 deletions

diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index c0a2951bc..ccbd5fe07 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -21,11 +21,11 @@ function node_overview_types() {
       $type_url_str = str_replace('_', '-', $type->type);
       $row = array(theme('node_admin_overview', $name, $type));
       // Set the edit column.
-      $row[] = array('data' => l(t('edit'), 'admin/structure/node-type/' . $type_url_str));
+      $row[] = array('data' => l(t('edit'), 'admin/structure/types/manage/' . $type_url_str));
 
       // Set the delete column.
       if ($type->custom) {
-        $row[] = array('data' => l(t('delete'), 'admin/structure/node-type/' . $type_url_str . '/delete'));
+        $row[] = array('data' => l(t('delete'), 'admin/structure/types/manage/' . $type_url_str . '/delete'));
       }
       else {
         $row[] = array('data' => '');
@@ -316,7 +316,7 @@ function node_type_form_submit($form, &$form_state) {
   $type->locked = $form_state['values']['locked'];
 
   if ($op == t('Delete content type')) {
-    $form_state['redirect'] = 'admin/structure/node-type/' . str_replace('_', '-', $type->old_type) . '/delete';
+    $form_state['redirect'] = 'admin/structure/types/manage/' . str_replace('_', '-', $type->old_type) . '/delete';
     return;
   }
 
diff --git a/modules/node/node.module b/modules/node/node.module
index 3c2d7610d..ba3dba855 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -92,13 +92,13 @@ function node_help($path, $arg) {
     case 'admin/structure/types/add':
       return '<p>' . t('Each piece of content is of a specific content type. Each <em>content type</em> can have different fields, behaviors, and permissions assigned to it.') . '</p>';
 
-    case 'admin/structure/node-type/' . $arg[3] . '/fields':
+    case 'admin/structure/types/manage/' . $arg[3] . '/fields':
       return '<p>' . t('This form lets you add, edit, and arrange fields within the %type content type.', array('%type' => node_type_get_name($arg[3]))) . '</p>';
 
-    case 'admin/structure/node-type/' . $arg[3] . '/display':
+    case 'admin/structure/types/manage/' . $arg[3] . '/display':
       return '<p>' . t('This form lets you configure how fields and labels are displayed when %type content is viewed in teaser and full-page mode.', array('%type' => node_type_get_name($arg[3]))) . '</p>';
 
-    case 'admin/structure/node-type/' . $arg[3] . '/display/' . $arg[5]:
+    case 'admin/structure/types/manage/' . $arg[3] . '/display/' . $arg[5]:
       return '<p>' . t('This form lets you configure how fields should be displayed when rendered %type content in the following contexts.', array('%type' => node_type_get_name($arg[3]))) . '</p>';
 
     case 'node/%/revisions':
@@ -200,7 +200,7 @@ function node_entity_info() {
     $return['node']['bundles'][$type] = array(
       'label' => $name,
       'admin' => array(
-        'path' => 'admin/structure/node-type/' . str_replace('_', '-', $type),
+        'path' => 'admin/structure/types/manage/' . str_replace('_', '-', $type),
         'access arguments' => array('administer content types'),
       ),
     );
@@ -1675,7 +1675,7 @@ function node_menu() {
       'description' => $type->description,
       'file' => 'node.pages.inc',
     );
-    $items['admin/structure/node-type/' . $type_url_str] = array(
+    $items['admin/structure/types/manage/' . $type_url_str] = array(
       'title' => $type->name,
       'page callback' => 'drupal_get_form',
       'page arguments' => array('node_type_form', $type),
@@ -1683,11 +1683,11 @@ function node_menu() {
       'type' => MENU_CALLBACK,
       'file' => 'content_types.inc',
     );
-    $items['admin/structure/node-type/' . $type_url_str . '/edit'] = array(
+    $items['admin/structure/types/manage/' . $type_url_str . '/edit'] = array(
       'title' => 'Edit',
       'type' => MENU_DEFAULT_LOCAL_TASK,
     );
-    $items['admin/structure/node-type/' . $type_url_str . '/delete'] = array(
+    $items['admin/structure/types/manage/' . $type_url_str . '/delete'] = array(
       'title' => 'Delete',
       'page arguments' => array('node_type_delete_confirm', $type),
       'access arguments' => array('administer content types'),
diff --git a/modules/node/node.test b/modules/node/node.test
index a48782b08..f9af7e4cd 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -424,7 +424,7 @@ class SummaryLengthTestCase extends DrupalWebTestCase {
     $edit = array (
       'teaser_length' => 200,
     );
-    $this->drupalPost('admin/structure/node-type/page', $edit, t('Save content type'));
+    $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     // Attempt to access the front page again and check if the summary is now only 200 characters in length.
     $this->drupalGet("node");
     $this->assertNoRaw($expected, t('Check that the summary is not longer than 200 characters'), 'Node');
@@ -522,7 +522,7 @@ class NodePostSettingsTestCase extends DrupalWebTestCase {
     // Set page content type to display post information.
     $edit = array();
     $edit['node_submitted'] = TRUE;
-    $this->drupalPost('admin/structure/node-type/page', $edit, t('Save content type'));
+    $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
 
     // Create a node.
     $edit = array();
@@ -544,7 +544,7 @@ class NodePostSettingsTestCase extends DrupalWebTestCase {
     // Set page content type to display post information.
     $edit = array();
     $edit['node_submitted'] = FALSE;
-    $this->drupalPost('admin/structure/node-type/page', $edit, t('Save content type'));
+    $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
 
     // Create a node.
     $edit = array();