diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php index 5793fd36f2..939a1ac4f1 100644 --- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php @@ -34082,6 +34082,195 @@ 'p9' => '0', 'updated' => '0', )) +->values(array( + 'menu_name' => 'navigation', + 'mlid' => '464', + 'plid' => '158', + 'link_path' => 'node/add/page', + 'router_path' => 'node/add/page', + 'link_title' => 'Page', + 'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";}}", + 'module' => 'system', + 'hidden' => '0', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + 'depth' => '2', + 'customized' => '0', + 'p1' => '158', + 'p2' => '464', + 'p3' => '0', + 'p4' => '0', + 'p5' => '0', + 'p6' => '0', + 'p7' => '0', + 'p8' => '0', + 'p9' => '0', + 'updated' => '0', +)) +->values(array( + 'menu_name' => 'navigation', + 'mlid' => '465', + 'plid' => '157', + 'link_path' => 'admin/content/node-type/page', + 'router_path' => 'admin/content/node-type/page', + 'link_title' => 'Page', + 'options' => 'a:0:{}', + 'module' => 'system', + 'hidden' => '-1', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + 'depth' => '3', + 'customized' => '0', + 'p1' => '144', + 'p2' => '157', + 'p3' => '465', + 'p4' => '0', + 'p5' => '0', + 'p6' => '0', + 'p7' => '0', + 'p8' => '0', + 'p9' => '0', + 'updated' => '0', +)) +->values(array( + 'menu_name' => 'navigation', + 'mlid' => '466', + 'plid' => '0', + 'link_path' => 'admin/content/node-type/page/delete', + 'router_path' => 'admin/content/node-type/page/delete', + 'link_title' => 'Delete', + 'options' => 'a:0:{}', + 'module' => 'system', + 'hidden' => '-1', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + 'depth' => '1', + 'customized' => '0', + 'p1' => '466', + 'p2' => '0', + 'p3' => '0', + 'p4' => '0', + 'p5' => '0', + 'p6' => '0', + 'p7' => '0', + 'p8' => '0', + 'p9' => '0', + 'updated' => '0', +)) +->values(array( + 'menu_name' => 'navigation', + 'mlid' => '467', + 'plid' => '0', + 'link_path' => 'admin/content/node-type/employee/fields/field_company_2/remove', + 'router_path' => 'admin/content/node-type/employee/fields/field_company_2/remove', + 'link_title' => 'Remove field', + 'options' => 'a:0:{}', + 'module' => 'system', + 'hidden' => '-1', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + 'depth' => '1', + 'customized' => '0', + 'p1' => '467', + 'p2' => '0', + 'p3' => '0', + 'p4' => '0', + 'p5' => '0', + 'p6' => '0', + 'p7' => '0', + 'p8' => '0', + 'p9' => '0', + 'updated' => '0', +)) +->values(array( + 'menu_name' => 'navigation', + 'mlid' => '468', + 'plid' => '0', + 'link_path' => 'admin/content/node-type/employee/fields/field_company_3/remove', + 'router_path' => 'admin/content/node-type/employee/fields/field_company_3/remove', + 'link_title' => 'Remove field', + 'options' => 'a:0:{}', + 'module' => 'system', + 'hidden' => '-1', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + 'depth' => '1', + 'customized' => '0', + 'p1' => '468', + 'p2' => '0', + 'p3' => '0', + 'p4' => '0', + 'p5' => '0', + 'p6' => '0', + 'p7' => '0', + 'p8' => '0', + 'p9' => '0', + 'updated' => '0', +)) +->values(array( + 'menu_name' => 'navigation', + 'mlid' => '469', + 'plid' => '0', + 'link_path' => 'admin/content/node-type/page/fields/field_reference/remove', + 'router_path' => 'admin/content/node-type/page/fields/field_reference/remove', + 'link_title' => 'Remove field', + 'options' => 'a:0:{}', + 'module' => 'system', + 'hidden' => '-1', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + 'depth' => '1', + 'customized' => '0', + 'p1' => '469', + 'p2' => '0', + 'p3' => '0', + 'p4' => '0', + 'p5' => '0', + 'p6' => '0', + 'p7' => '0', + 'p8' => '0', + 'p9' => '0', + 'updated' => '0', +)) +->values(array( + 'menu_name' => 'navigation', + 'mlid' => '470', + 'plid' => '0', + 'link_path' => 'admin/content/node-type/page/fields/field_reference_2/remove', + 'router_path' => 'admin/content/node-type/page/fields/field_reference_2/remove', + 'link_title' => 'Remove field', + 'options' => 'a:0:{}', + 'module' => 'system', + 'hidden' => '-1', + 'external' => '0', + 'has_children' => '0', + 'expanded' => '0', + 'weight' => '0', + 'depth' => '1', + 'customized' => '0', + 'p1' => '470', + 'p2' => '0', + 'p3' => '0', + 'p4' => '0', + 'p5' => '0', + 'p6' => '0', + 'p7' => '0', + 'p8' => '0', + 'p9' => '0', + 'updated' => '0', +)) ->execute(); $connection->schema()->createTable('menu_router', array( @@ -36695,17 +36884,369 @@ 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/employee/display/rss', + 'path' => 'admin/content/node-type/employee/display/rss', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:8:"employee";i:2;s:3:"rss";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/employee/display', + 'tab_root' => 'admin/content/node-type/employee', + 'title' => 'RSS', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '128', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '1', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/edit', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":14:{s:4:"type";s:8:"employee";s:4:"name";s:8:"Employee";s:6:"module";s:4:"node";s:11:"description";s:18:"Employee node type";s:4:"help";s:0:"";s:9:"has_title";s:1:"1";s:11:"title_label";s:4:"Name";s:8:"has_body";s:1:"1";s:10:"body_label";s:3:"Bio";s:14:"min_word_count";s:2:"20";s:6:"custom";s:1:"0";s:8:"modified";s:1:"0";s:6:"locked";s:1:"0";s:9:"orig_type";s:8:"employee";}}', + 'fit' => '31', + 'number_parts' => '5', + 'tab_parent' => 'admin/content/node-type/employee', + 'tab_root' => 'admin/content/node-type/employee', + 'title' => 'Edit', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '136', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'modules/node/content_types.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/fields', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:2:{i:0;s:27:"content_field_overview_form";i:1;s:8:"employee";}', + 'fit' => '31', + 'number_parts' => '5', + 'tab_parent' => 'admin/content/node-type/employee', + 'tab_root' => 'admin/content/node-type/employee', + 'title' => 'Manage fields', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '128', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '1', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/fields/field_commander', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:8:"employee";i:2;s:15:"field_commander";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/employee/fields', + 'tab_root' => 'admin/content/node-type/employee', + 'title' => 'Commanding Officer', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '128', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/fields/field_commander/remove', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:8:"employee";i:2;s:15:"field_commander";}', + 'fit' => '127', + 'number_parts' => '7', + 'tab_parent' => '', + 'tab_root' => 'admin/content/node-type/employee/fields/field_commander/remove', + 'title' => 'Remove field', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '4', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/fields/field_company', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:8:"employee";i:2;s:13:"field_company";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/employee/fields', + 'tab_root' => 'admin/content/node-type/employee', + 'title' => 'Company', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '128', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/fields/field_company/remove', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:8:"employee";i:2;s:13:"field_company";}', + 'fit' => '127', + 'number_parts' => '7', + 'tab_parent' => '', + 'tab_root' => 'admin/content/node-type/employee/fields/field_company/remove', + 'title' => 'Remove field', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '4', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/fields/field_company_2', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:8:"employee";i:2;s:15:"field_company_2";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/employee/fields', + 'tab_root' => 'admin/content/node-type/employee', + 'title' => 'Company 2', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '128', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/fields/field_company_2/remove', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:8:"employee";i:2;s:15:"field_company_2";}', + 'fit' => '127', + 'number_parts' => '7', + 'tab_parent' => '', + 'tab_root' => 'admin/content/node-type/employee/fields/field_company_2/remove', + 'title' => 'Remove field', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '4', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/fields/field_company_3', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:8:"employee";i:2;s:15:"field_company_3";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/employee/fields', + 'tab_root' => 'admin/content/node-type/employee', + 'title' => 'Company 3', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '128', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/employee/fields/field_company_3/remove', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:8:"employee";i:2;s:15:"field_company_3";}', + 'fit' => '127', + 'number_parts' => '7', + 'tab_parent' => '', + 'tab_root' => 'admin/content/node-type/employee/fields/field_company_3/remove', + 'title' => 'Remove field', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '4', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/forum', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":15:{s:4:"name";s:11:"Forum topic";s:6:"module";s:5:"forum";s:11:"description";s:85:"A forum topic is the initial post to a new discussion thread within a forum.";s:11:"title_label";s:7:"Subject";s:4:"type";s:5:"forum";s:9:"has_title";b:1;s:8:"has_body";b:1;s:10:"body_label";s:4:"Body";s:4:"help";s:0:"";s:14:"min_word_count";i:0;s:6:"custom";b:0;s:8:"modified";b:0;s:6:"locked";b:1;s:9:"orig_type";s:5:"forum";s:6:"is_new";b:1;}}', + 'fit' => '15', + 'number_parts' => '4', + 'tab_parent' => '', + 'tab_root' => 'admin/content/node-type/forum', + 'title' => 'Forum topic', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '4', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'modules/node/content_types.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/forum/delete', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:2:{i:0;s:24:"node_type_delete_confirm";i:1;O:8:"stdClass":15:{s:4:"name";s:11:"Forum topic";s:6:"module";s:5:"forum";s:11:"description";s:85:"A forum topic is the initial post to a new discussion thread within a forum.";s:11:"title_label";s:7:"Subject";s:4:"type";s:5:"forum";s:9:"has_title";b:1;s:8:"has_body";b:1;s:10:"body_label";s:4:"Body";s:4:"help";s:0:"";s:14:"min_word_count";i:0;s:6:"custom";b:0;s:8:"modified";b:0;s:6:"locked";b:1;s:9:"orig_type";s:5:"forum";s:6:"is_new";b:1;}}', + 'fit' => '31', + 'number_parts' => '5', + 'tab_parent' => '', + 'tab_root' => 'admin/content/node-type/forum/delete', + 'title' => 'Delete', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '4', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'modules/node/content_types.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/forum/display', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:2:{i:0;s:29:"content_display_overview_form";i:1;s:5:"forum";}', + 'fit' => '31', + 'number_parts' => '5', + 'tab_parent' => 'admin/content/node-type/forum', + 'tab_root' => 'admin/content/node-type/forum', + 'title' => 'Display fields', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '128', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '2', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/forum/display/basic', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:5:"forum";i:2;s:5:"basic";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/forum/display', + 'tab_root' => 'admin/content/node-type/forum', + 'title' => 'Basic', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '136', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/forum/display/print', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:5:"forum";i:2;s:5:"print";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/forum/display', + 'tab_root' => 'admin/content/node-type/forum', + 'title' => 'Print', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '128', + 'block_callback' => '', + 'description' => '', + 'position' => '', + 'weight' => '1', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', +)) +->values(array( + 'path' => 'admin/content/node-type/forum/display/rss', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:8:"employee";i:2;s:3:"rss";}', + 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:5:"forum";i:2;s:3:"rss";}', 'fit' => '63', 'number_parts' => '6', - 'tab_parent' => 'admin/content/node-type/employee/display', - 'tab_root' => 'admin/content/node-type/employee', + 'tab_parent' => 'admin/content/node-type/forum/display', + 'tab_root' => 'admin/content/node-type/forum', 'title' => 'RSS', 'title_callback' => 't', 'title_arguments' => '', @@ -36717,17 +37258,17 @@ 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/employee/edit', + 'path' => 'admin/content/node-type/forum/edit', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":14:{s:4:"type";s:8:"employee";s:4:"name";s:8:"Employee";s:6:"module";s:4:"node";s:11:"description";s:18:"Employee node type";s:4:"help";s:0:"";s:9:"has_title";s:1:"1";s:11:"title_label";s:4:"Name";s:8:"has_body";s:1:"1";s:10:"body_label";s:3:"Bio";s:14:"min_word_count";s:2:"20";s:6:"custom";s:1:"0";s:8:"modified";s:1:"0";s:6:"locked";s:1:"0";s:9:"orig_type";s:8:"employee";}}', + 'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":15:{s:4:"name";s:11:"Forum topic";s:6:"module";s:5:"forum";s:11:"description";s:85:"A forum topic is the initial post to a new discussion thread within a forum.";s:11:"title_label";s:7:"Subject";s:4:"type";s:5:"forum";s:9:"has_title";b:1;s:8:"has_body";b:1;s:10:"body_label";s:4:"Body";s:4:"help";s:0:"";s:14:"min_word_count";i:0;s:6:"custom";b:0;s:8:"modified";b:0;s:6:"locked";b:1;s:9:"orig_type";s:5:"forum";s:6:"is_new";b:1;}}', 'fit' => '31', 'number_parts' => '5', - 'tab_parent' => 'admin/content/node-type/employee', - 'tab_root' => 'admin/content/node-type/employee', + 'tab_parent' => 'admin/content/node-type/forum', + 'tab_root' => 'admin/content/node-type/forum', 'title' => 'Edit', 'title_callback' => 't', 'title_arguments' => '', @@ -36739,17 +37280,17 @@ 'file' => 'modules/node/content_types.inc', )) ->values(array( - 'path' => 'admin/content/node-type/employee/fields', + 'path' => 'admin/content/node-type/forum/fields', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:2:{i:0;s:27:"content_field_overview_form";i:1;s:8:"employee";}', + 'page_arguments' => 'a:2:{i:0;s:27:"content_field_overview_form";i:1;s:5:"forum";}', 'fit' => '31', 'number_parts' => '5', - 'tab_parent' => 'admin/content/node-type/employee', - 'tab_root' => 'admin/content/node-type/employee', + 'tab_parent' => 'admin/content/node-type/forum', + 'tab_root' => 'admin/content/node-type/forum', 'title' => 'Manage fields', 'title_callback' => 't', 'title_arguments' => '', @@ -36761,40 +37302,40 @@ 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/employee/fields/field_commander', + 'path' => 'admin/content/node-type/page', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:8:"employee";i:2;s:15:"field_commander";}', - 'fit' => '63', - 'number_parts' => '6', - 'tab_parent' => 'admin/content/node-type/employee/fields', - 'tab_root' => 'admin/content/node-type/employee', - 'title' => 'Commanding Officer', + 'page_arguments' => "a:2:{i:0;s:14:\"node_type_form\";i:1;O:8:\"stdClass\":14:{s:4:\"type\";s:4:\"page\";s:4:\"name\";s:4:\"Page\";s:6:\"module\";s:4:\"node\";s:11:\"description\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";s:4:\"help\";s:0:\"\";s:9:\"has_title\";s:1:\"1\";s:11:\"title_label\";s:5:\"Title\";s:8:\"has_body\";s:1:\"1\";s:10:\"body_label\";s:4:\"Body\";s:14:\"min_word_count\";s:1:\"0\";s:6:\"custom\";s:1:\"1\";s:8:\"modified\";s:1:\"1\";s:6:\"locked\";s:1:\"0\";s:9:\"orig_type\";s:4:\"page\";}}", + 'fit' => '15', + 'number_parts' => '4', + 'tab_parent' => '', + 'tab_root' => 'admin/content/node-type/page', + 'title' => 'Page', 'title_callback' => 't', 'title_arguments' => '', - 'type' => '128', + 'type' => '4', 'block_callback' => '', 'description' => '', 'position' => '', 'weight' => '0', - 'file' => 'sites/all/modules/cck/includes/content.admin.inc', + 'file' => 'modules/node/content_types.inc', )) ->values(array( - 'path' => 'admin/content/node-type/employee/fields/field_commander/remove', + 'path' => 'admin/content/node-type/page/delete', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:8:"employee";i:2;s:15:"field_commander";}', - 'fit' => '127', - 'number_parts' => '7', + 'page_arguments' => "a:2:{i:0;s:24:\"node_type_delete_confirm\";i:1;O:8:\"stdClass\":14:{s:4:\"type\";s:4:\"page\";s:4:\"name\";s:4:\"Page\";s:6:\"module\";s:4:\"node\";s:11:\"description\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";s:4:\"help\";s:0:\"\";s:9:\"has_title\";s:1:\"1\";s:11:\"title_label\";s:5:\"Title\";s:8:\"has_body\";s:1:\"1\";s:10:\"body_label\";s:4:\"Body\";s:14:\"min_word_count\";s:1:\"0\";s:6:\"custom\";s:1:\"1\";s:8:\"modified\";s:1:\"1\";s:6:\"locked\";s:1:\"0\";s:9:\"orig_type\";s:4:\"page\";}}", + 'fit' => '31', + 'number_parts' => '5', 'tab_parent' => '', - 'tab_root' => 'admin/content/node-type/employee/fields/field_commander/remove', - 'title' => 'Remove field', + 'tab_root' => 'admin/content/node-type/page/delete', + 'title' => 'Delete', 'title_callback' => 't', 'title_arguments' => '', 'type' => '4', @@ -36802,46 +37343,46 @@ 'description' => '', 'position' => '', 'weight' => '0', - 'file' => 'sites/all/modules/cck/includes/content.admin.inc', + 'file' => 'modules/node/content_types.inc', )) ->values(array( - 'path' => 'admin/content/node-type/employee/fields/field_company', + 'path' => 'admin/content/node-type/page/display', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:8:"employee";i:2;s:13:"field_company";}', - 'fit' => '63', - 'number_parts' => '6', - 'tab_parent' => 'admin/content/node-type/employee/fields', - 'tab_root' => 'admin/content/node-type/employee', - 'title' => 'Company', + 'page_arguments' => 'a:2:{i:0;s:29:"content_display_overview_form";i:1;s:4:"page";}', + 'fit' => '31', + 'number_parts' => '5', + 'tab_parent' => 'admin/content/node-type/page', + 'tab_root' => 'admin/content/node-type/page', + 'title' => 'Display fields', 'title_callback' => 't', 'title_arguments' => '', 'type' => '128', 'block_callback' => '', 'description' => '', 'position' => '', - 'weight' => '0', + 'weight' => '2', 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/employee/fields/field_company/remove', + 'path' => 'admin/content/node-type/page/display/basic', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:8:"employee";i:2;s:13:"field_company";}', - 'fit' => '127', - 'number_parts' => '7', - 'tab_parent' => '', - 'tab_root' => 'admin/content/node-type/employee/fields/field_company/remove', - 'title' => 'Remove field', + 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:4:"page";i:2;s:5:"basic";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/page/display', + 'tab_root' => 'admin/content/node-type/page', + 'title' => 'Basic', 'title_callback' => 't', 'title_arguments' => '', - 'type' => '4', + 'type' => '136', 'block_callback' => '', 'description' => '', 'position' => '', @@ -36849,179 +37390,179 @@ 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/forum', + 'path' => 'admin/content/node-type/page/display/print', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":15:{s:4:"name";s:11:"Forum topic";s:6:"module";s:5:"forum";s:11:"description";s:85:"A forum topic is the initial post to a new discussion thread within a forum.";s:11:"title_label";s:7:"Subject";s:4:"type";s:5:"forum";s:9:"has_title";b:1;s:8:"has_body";b:1;s:10:"body_label";s:4:"Body";s:4:"help";s:0:"";s:14:"min_word_count";i:0;s:6:"custom";b:0;s:8:"modified";b:0;s:6:"locked";b:1;s:9:"orig_type";s:5:"forum";s:6:"is_new";b:1;}}', - 'fit' => '15', - 'number_parts' => '4', - 'tab_parent' => '', - 'tab_root' => 'admin/content/node-type/forum', - 'title' => 'Forum topic', + 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:4:"page";i:2;s:5:"print";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/page/display', + 'tab_root' => 'admin/content/node-type/page', + 'title' => 'Print', 'title_callback' => 't', 'title_arguments' => '', - 'type' => '4', + 'type' => '128', 'block_callback' => '', 'description' => '', 'position' => '', - 'weight' => '0', - 'file' => 'modules/node/content_types.inc', + 'weight' => '1', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/forum/delete', + 'path' => 'admin/content/node-type/page/display/rss', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:2:{i:0;s:24:"node_type_delete_confirm";i:1;O:8:"stdClass":15:{s:4:"name";s:11:"Forum topic";s:6:"module";s:5:"forum";s:11:"description";s:85:"A forum topic is the initial post to a new discussion thread within a forum.";s:11:"title_label";s:7:"Subject";s:4:"type";s:5:"forum";s:9:"has_title";b:1;s:8:"has_body";b:1;s:10:"body_label";s:4:"Body";s:4:"help";s:0:"";s:14:"min_word_count";i:0;s:6:"custom";b:0;s:8:"modified";b:0;s:6:"locked";b:1;s:9:"orig_type";s:5:"forum";s:6:"is_new";b:1;}}', - 'fit' => '31', - 'number_parts' => '5', - 'tab_parent' => '', - 'tab_root' => 'admin/content/node-type/forum/delete', - 'title' => 'Delete', + 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:4:"page";i:2;s:3:"rss";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/page/display', + 'tab_root' => 'admin/content/node-type/page', + 'title' => 'RSS', 'title_callback' => 't', 'title_arguments' => '', - 'type' => '4', + 'type' => '128', 'block_callback' => '', 'description' => '', 'position' => '', - 'weight' => '0', - 'file' => 'modules/node/content_types.inc', + 'weight' => '1', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/forum/display', + 'path' => 'admin/content/node-type/page/edit', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:2:{i:0;s:29:"content_display_overview_form";i:1;s:5:"forum";}', + 'page_arguments' => "a:2:{i:0;s:14:\"node_type_form\";i:1;O:8:\"stdClass\":14:{s:4:\"type\";s:4:\"page\";s:4:\"name\";s:4:\"Page\";s:6:\"module\";s:4:\"node\";s:11:\"description\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";s:4:\"help\";s:0:\"\";s:9:\"has_title\";s:1:\"1\";s:11:\"title_label\";s:5:\"Title\";s:8:\"has_body\";s:1:\"1\";s:10:\"body_label\";s:4:\"Body\";s:14:\"min_word_count\";s:1:\"0\";s:6:\"custom\";s:1:\"1\";s:8:\"modified\";s:1:\"1\";s:6:\"locked\";s:1:\"0\";s:9:\"orig_type\";s:4:\"page\";}}", 'fit' => '31', 'number_parts' => '5', - 'tab_parent' => 'admin/content/node-type/forum', - 'tab_root' => 'admin/content/node-type/forum', - 'title' => 'Display fields', + 'tab_parent' => 'admin/content/node-type/page', + 'tab_root' => 'admin/content/node-type/page', + 'title' => 'Edit', 'title_callback' => 't', 'title_arguments' => '', - 'type' => '128', + 'type' => '136', 'block_callback' => '', 'description' => '', 'position' => '', - 'weight' => '2', - 'file' => 'sites/all/modules/cck/includes/content.admin.inc', + 'weight' => '0', + 'file' => 'modules/node/content_types.inc', )) ->values(array( - 'path' => 'admin/content/node-type/forum/display/basic', + 'path' => 'admin/content/node-type/page/fields', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:5:"forum";i:2;s:5:"basic";}', - 'fit' => '63', - 'number_parts' => '6', - 'tab_parent' => 'admin/content/node-type/forum/display', - 'tab_root' => 'admin/content/node-type/forum', - 'title' => 'Basic', + 'page_arguments' => 'a:2:{i:0;s:27:"content_field_overview_form";i:1;s:4:"page";}', + 'fit' => '31', + 'number_parts' => '5', + 'tab_parent' => 'admin/content/node-type/page', + 'tab_root' => 'admin/content/node-type/page', + 'title' => 'Manage fields', 'title_callback' => 't', 'title_arguments' => '', - 'type' => '136', + 'type' => '128', 'block_callback' => '', 'description' => '', 'position' => '', - 'weight' => '0', + 'weight' => '1', 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/forum/display/print', + 'path' => 'admin/content/node-type/page/fields/field_reference', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:5:"forum";i:2;s:5:"print";}', + 'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:4:"page";i:2;s:15:"field_reference";}', 'fit' => '63', 'number_parts' => '6', - 'tab_parent' => 'admin/content/node-type/forum/display', - 'tab_root' => 'admin/content/node-type/forum', - 'title' => 'Print', + 'tab_parent' => 'admin/content/node-type/page/fields', + 'tab_root' => 'admin/content/node-type/page', + 'title' => 'Reference', 'title_callback' => 't', 'title_arguments' => '', 'type' => '128', 'block_callback' => '', 'description' => '', 'position' => '', - 'weight' => '1', + 'weight' => '0', 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/forum/display/rss', + 'path' => 'admin/content/node-type/page/fields/field_reference/remove', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:3:{i:0;s:29:"content_display_overview_form";i:1;s:5:"forum";i:2;s:3:"rss";}', - 'fit' => '63', - 'number_parts' => '6', - 'tab_parent' => 'admin/content/node-type/forum/display', - 'tab_root' => 'admin/content/node-type/forum', - 'title' => 'RSS', + 'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:4:"page";i:2;s:15:"field_reference";}', + 'fit' => '127', + 'number_parts' => '7', + 'tab_parent' => '', + 'tab_root' => 'admin/content/node-type/page/fields/field_reference/remove', + 'title' => 'Remove field', 'title_callback' => 't', 'title_arguments' => '', - 'type' => '128', + 'type' => '4', 'block_callback' => '', 'description' => '', 'position' => '', - 'weight' => '1', + 'weight' => '0', 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/forum/edit', + 'path' => 'admin/content/node-type/page/fields/field_reference_2', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":15:{s:4:"name";s:11:"Forum topic";s:6:"module";s:5:"forum";s:11:"description";s:85:"A forum topic is the initial post to a new discussion thread within a forum.";s:11:"title_label";s:7:"Subject";s:4:"type";s:5:"forum";s:9:"has_title";b:1;s:8:"has_body";b:1;s:10:"body_label";s:4:"Body";s:4:"help";s:0:"";s:14:"min_word_count";i:0;s:6:"custom";b:0;s:8:"modified";b:0;s:6:"locked";b:1;s:9:"orig_type";s:5:"forum";s:6:"is_new";b:1;}}', - 'fit' => '31', - 'number_parts' => '5', - 'tab_parent' => 'admin/content/node-type/forum', - 'tab_root' => 'admin/content/node-type/forum', - 'title' => 'Edit', + 'page_arguments' => 'a:3:{i:0;s:23:"content_field_edit_form";i:1;s:4:"page";i:2;s:17:"field_reference_2";}', + 'fit' => '63', + 'number_parts' => '6', + 'tab_parent' => 'admin/content/node-type/page/fields', + 'tab_root' => 'admin/content/node-type/page', + 'title' => 'Reference', 'title_callback' => 't', 'title_arguments' => '', - 'type' => '136', + 'type' => '128', 'block_callback' => '', 'description' => '', 'position' => '', 'weight' => '0', - 'file' => 'modules/node/content_types.inc', + 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( - 'path' => 'admin/content/node-type/forum/fields', + 'path' => 'admin/content/node-type/page/fields/field_reference_2/remove', 'load_functions' => '', 'to_arg_functions' => '', 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => 'a:2:{i:0;s:27:"content_field_overview_form";i:1;s:5:"forum";}', - 'fit' => '31', - 'number_parts' => '5', - 'tab_parent' => 'admin/content/node-type/forum', - 'tab_root' => 'admin/content/node-type/forum', - 'title' => 'Manage fields', + 'page_arguments' => 'a:3:{i:0;s:25:"content_field_remove_form";i:1;s:4:"page";i:2;s:17:"field_reference_2";}', + 'fit' => '127', + 'number_parts' => '7', + 'tab_parent' => '', + 'tab_root' => 'admin/content/node-type/page/fields/field_reference_2/remove', + 'title' => 'Remove field', 'title_callback' => 't', 'title_arguments' => '', - 'type' => '128', + 'type' => '4', 'block_callback' => '', 'description' => '', 'position' => '', - 'weight' => '1', + 'weight' => '0', 'file' => 'sites/all/modules/cck/includes/content.admin.inc', )) ->values(array( @@ -38439,7 +38980,7 @@ 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => "a:2:{i:0;s:14:\"node_type_form\";i:1;O:8:\"stdClass\":14:{s:4:\"type\";s:9:\"test_page\";s:4:\"name\";s:17:\"Migrate test page\";s:6:\"module\";s:4:\"node\";s:11:\"description\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";s:4:\"help\";s:0:\"\";s:9:\"has_title\";s:1:\"1\";s:11:\"title_label\";s:5:\"Title\";s:8:\"has_body\";s:1:\"1\";s:10:\"body_label\";s:28:\"This is the body field label\";s:14:\"min_word_count\";s:1:\"0\";s:6:\"custom\";s:1:\"1\";s:8:\"modified\";s:1:\"1\";s:6:\"locked\";s:1:\"0\";s:9:\"orig_type\";s:4:\"page\";}}", + 'page_arguments' => "a:2:{i:0;s:14:\"node_type_form\";i:1;O:8:\"stdClass\":14:{s:4:\"type\";s:9:\"test_page\";s:4:\"name\";s:17:\"Migrate test page\";s:6:\"module\";s:4:\"node\";s:11:\"description\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";s:4:\"help\";s:0:\"\";s:9:\"has_title\";s:1:\"1\";s:11:\"title_label\";s:5:\"Title\";s:8:\"has_body\";s:1:\"1\";s:10:\"body_label\";s:28:\"This is the body field label\";s:14:\"min_word_count\";s:1:\"0\";s:6:\"custom\";s:1:\"1\";s:8:\"modified\";s:1:\"1\";s:6:\"locked\";s:1:\"0\";s:9:\"orig_type\";s:9:\"test_page\";}}", 'fit' => '15', 'number_parts' => '4', 'tab_parent' => '', @@ -38461,7 +39002,7 @@ 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => "a:2:{i:0;s:24:\"node_type_delete_confirm\";i:1;O:8:\"stdClass\":14:{s:4:\"type\";s:9:\"test_page\";s:4:\"name\";s:17:\"Migrate test page\";s:6:\"module\";s:4:\"node\";s:11:\"description\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";s:4:\"help\";s:0:\"\";s:9:\"has_title\";s:1:\"1\";s:11:\"title_label\";s:5:\"Title\";s:8:\"has_body\";s:1:\"1\";s:10:\"body_label\";s:28:\"This is the body field label\";s:14:\"min_word_count\";s:1:\"0\";s:6:\"custom\";s:1:\"1\";s:8:\"modified\";s:1:\"1\";s:6:\"locked\";s:1:\"0\";s:9:\"orig_type\";s:4:\"page\";}}", + 'page_arguments' => "a:2:{i:0;s:24:\"node_type_delete_confirm\";i:1;O:8:\"stdClass\":14:{s:4:\"type\";s:9:\"test_page\";s:4:\"name\";s:17:\"Migrate test page\";s:6:\"module\";s:4:\"node\";s:11:\"description\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";s:4:\"help\";s:0:\"\";s:9:\"has_title\";s:1:\"1\";s:11:\"title_label\";s:5:\"Title\";s:8:\"has_body\";s:1:\"1\";s:10:\"body_label\";s:28:\"This is the body field label\";s:14:\"min_word_count\";s:1:\"0\";s:6:\"custom\";s:1:\"1\";s:8:\"modified\";s:1:\"1\";s:6:\"locked\";s:1:\"0\";s:9:\"orig_type\";s:9:\"test_page\";}}", 'fit' => '31', 'number_parts' => '5', 'tab_parent' => '', @@ -38571,7 +39112,7 @@ 'access_callback' => 'user_access', 'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}', 'page_callback' => 'drupal_get_form', - 'page_arguments' => "a:2:{i:0;s:14:\"node_type_form\";i:1;O:8:\"stdClass\":14:{s:4:\"type\";s:9:\"test_page\";s:4:\"name\";s:17:\"Migrate test page\";s:6:\"module\";s:4:\"node\";s:11:\"description\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";s:4:\"help\";s:0:\"\";s:9:\"has_title\";s:1:\"1\";s:11:\"title_label\";s:5:\"Title\";s:8:\"has_body\";s:1:\"1\";s:10:\"body_label\";s:28:\"This is the body field label\";s:14:\"min_word_count\";s:1:\"0\";s:6:\"custom\";s:1:\"1\";s:8:\"modified\";s:1:\"1\";s:6:\"locked\";s:1:\"0\";s:9:\"orig_type\";s:4:\"page\";}}", + 'page_arguments' => "a:2:{i:0;s:14:\"node_type_form\";i:1;O:8:\"stdClass\":14:{s:4:\"type\";s:9:\"test_page\";s:4:\"name\";s:17:\"Migrate test page\";s:6:\"module\";s:4:\"node\";s:11:\"description\";s:296:\"A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.\";s:4:\"help\";s:0:\"\";s:9:\"has_title\";s:1:\"1\";s:11:\"title_label\";s:5:\"Title\";s:8:\"has_body\";s:1:\"1\";s:10:\"body_label\";s:28:\"This is the body field label\";s:14:\"min_word_count\";s:1:\"0\";s:6:\"custom\";s:1:\"1\";s:8:\"modified\";s:1:\"1\";s:6:\"locked\";s:1:\"0\";s:9:\"orig_type\";s:9:\"test_page\";}}", 'fit' => '31', 'number_parts' => '5', 'tab_parent' => 'admin/content/node-type/test-page', @@ -40622,7 +41163,7 @@ 'number_parts' => '5', 'tab_parent' => 'admin/settings/language/i18n', 'tab_root' => 'admin/settings/language', - 'title' => 'Multilingual system', + 'title' => 'Options', 'title_callback' => 't', 'title_arguments' => '', 'type' => '136', @@ -40633,6 +41174,28 @@ 'file' => 'sites/all/modules/i18n/i18n.admin.inc', )) ->values(array( + 'path' => 'admin/settings/language/i18n/variables', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'user_access', + 'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}', + 'page_callback' => 'drupal_get_form', + 'page_arguments' => 'a:1:{i:0;s:25:"i18n_admin_variables_form";}', + 'fit' => '31', + 'number_parts' => '5', + 'tab_parent' => 'admin/settings/language/i18n', + 'tab_root' => 'admin/settings/language', + 'title' => 'Variables', + 'title_callback' => 't', + 'title_arguments' => '', + 'type' => '128', + 'block_callback' => '', + 'description' => 'Multilingual variables.', + 'position' => '', + 'weight' => '0', + 'file' => 'sites/all/modules/i18n/i18n.admin.inc', +)) +->values(array( 'path' => 'admin/settings/language/overview', 'load_functions' => '', 'to_arg_functions' => '', @@ -42547,6 +43110,28 @@ 'file' => 'modules/node/node.pages.inc', )) ->values(array( + 'path' => 'node/add/page', + 'load_functions' => '', + 'to_arg_functions' => '', + 'access_callback' => 'node_access', + 'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:4:"page";}', + 'page_callback' => 'i18ncontent_node_add', + 'page_arguments' => 'a:1:{i:0;i:2;}', + 'fit' => '7', + 'number_parts' => '3', + 'tab_parent' => '', + 'tab_root' => 'node/add/page', + 'title' => 'Page', + 'title_callback' => 'i18nstrings_title_callback', + 'title_arguments' => 'a:2:{i:0;s:23:"nodetype:type:page:name";i:1;s:4:"Page";}', + 'type' => '6', + 'block_callback' => '', + 'description' => "A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.", + 'position' => '', + 'weight' => '0', + 'file' => 'modules/node/node.pages.inc', +)) +->values(array( 'path' => 'node/add/sponsor', 'load_functions' => '', 'to_arg_functions' => '', @@ -42604,7 +43189,7 @@ 'tab_root' => 'node/add/test-event', 'title' => 'Migrate test event', 'title_callback' => 'i18nstrings_title_callback', - 'title_arguments' => 'a:2:{i:0;s:29:"nodetype:type:test-event:name";i:1;s:18:"Migrate test event";}', + 'title_arguments' => 'a:2:{i:0;s:29:"nodetype:type:test_event:name";i:1;s:18:"Migrate test event";}', 'type' => '6', 'block_callback' => '', 'description' => 'test event description here', @@ -42626,7 +43211,7 @@ 'tab_root' => 'node/add/test-page', 'title' => 'Migrate test page', 'title_callback' => 'i18nstrings_title_callback', - 'title_arguments' => 'a:2:{i:0;s:28:"nodetype:type:test-page:name";i:1;s:17:"Migrate test page";}', + 'title_arguments' => 'a:2:{i:0;s:28:"nodetype:type:test_page:name";i:1;s:17:"Migrate test page";}', 'type' => '6', 'block_callback' => '', 'description' => "A page, similar in form to a story, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a page entry does not allow visitor comments and is not featured on the site's initial home page.", @@ -42648,7 +43233,7 @@ 'tab_root' => 'node/add/test-planet', 'title' => 'Migrate test planet', 'title_callback' => 'i18nstrings_title_callback', - 'title_arguments' => 'a:2:{i:0;s:30:"nodetype:type:test-planet:name";i:1;s:19:"Migrate test planet";}', + 'title_arguments' => 'a:2:{i:0;s:30:"nodetype:type:test_planet:name";i:1;s:19:"Migrate test planet";}', 'type' => '6', 'block_callback' => '', 'description' => "A story, similar in form to a page, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a story entry. By default, a story entry is automatically featured on the site's initial home page, and provides the ability to post comments.", @@ -42670,7 +43255,7 @@ 'tab_root' => 'node/add/test-story', 'title' => 'Migrate test story', 'title_callback' => 'i18nstrings_title_callback', - 'title_arguments' => 'a:2:{i:0;s:29:"nodetype:type:test-story:name";i:1;s:18:"Migrate test story";}', + 'title_arguments' => 'a:2:{i:0;s:29:"nodetype:type:test_story:name";i:1;s:18:"Migrate test story";}', 'type' => '6', 'block_callback' => '', 'description' => "A story, similar in form to a page, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a story entry. By default, a story entry is automatically featured on the site's initial home page, and provides the ability to post comments.", @@ -47286,8 +47871,8 @@ 'signature' => '', 'signature_format' => '0', 'created' => '0', - 'access' => '1494966478', - 'login' => '1494966280', + 'access' => '1530957487', + 'login' => '1530882460', 'status' => '1', 'timezone' => NULL, 'language' => '', @@ -47656,7 +48241,7 @@ )) ->values(array( 'name' => 'comment_controls_story', - 'value' => 'i:3;', + 'value' => 's:1:"3";', )) ->values(array( 'name' => 'comment_controls_test_event', @@ -47736,7 +48321,7 @@ )) ->values(array( 'name' => 'comment_default_order_story', - 'value' => 'i:1;', + 'value' => 's:1:"1";', )) ->values(array( 'name' => 'comment_default_order_test_event', @@ -47776,7 +48361,7 @@ )) ->values(array( 'name' => 'comment_default_per_page_story', - 'value' => 'i:70;', + 'value' => 's:2:"70";', )) ->values(array( 'name' => 'comment_default_per_page_test_event', @@ -47816,7 +48401,7 @@ )) ->values(array( 'name' => 'comment_form_location_story', - 'value' => 'i:0;', + 'value' => 's:1:"0";', )) ->values(array( 'name' => 'comment_form_location_test_event', @@ -47860,7 +48445,7 @@ )) ->values(array( 'name' => 'comment_preview_story', - 'value' => 'i:0;', + 'value' => 's:1:"0";', )) ->values(array( 'name' => 'comment_preview_test_event', @@ -47904,7 +48489,7 @@ )) ->values(array( 'name' => 'comment_subject_field_story', - 'value' => 'i:0;', + 'value' => 's:1:"0";', )) ->values(array( 'name' => 'comment_subject_field_test_event', @@ -48263,6 +48848,10 @@ 'value' => 's:3:"all";', )) ->values(array( + 'name' => 'event_nodeapi_story', + 'value' => 's:5:"never";', +)) +->values(array( 'name' => 'event_timezone_display', 'value' => 's:5:"event";', )) @@ -48327,6 +48916,10 @@ 'value' => 's:48:"form-jFw2agRukPxjG5dG-N6joZLyoxXmCoxTzua0HUciqK0";', )) ->values(array( + 'name' => 'form_build_id_story', + 'value' => 's:48:"form-g_o9_E3dszqfxL1qIbEhpTizntb8JqKlwST0Job2pGI";', +)) +->values(array( 'name' => 'forum_block_num_0', 'value' => 's:1:"3";', )) @@ -48356,13 +48949,29 @@ )) ->values(array( 'name' => 'i18ntaxonomy_vocabulary', - 'value' => 'a:2:{i:1;s:1:"3";i:2;s:1:"2";}', + 'value' => 'a:4:{i:1;s:1:"3";i:2;s:1:"2";i:3;s:1:"3";i:5;s:1:"1";}', )) ->values(array( 'name' => 'i18n_lock_node_article', 'value' => 'i:1;', )) ->values(array( + 'name' => 'i18n_lock_node_story', + 'value' => 'i:0;', +)) +->values(array( + 'name' => 'i18n_newnode_current_story', + 'value' => 'i:0;', +)) +->values(array( + 'name' => 'i18n_node_story', + 'value' => 's:1:"1";', +)) +->values(array( + 'name' => 'i18n_required_node_story', + 'value' => 'i:0;', +)) +->values(array( 'name' => 'image_jpeg_quality', 'value' => 'i:75;', )) @@ -48372,7 +48981,7 @@ )) ->values(array( 'name' => 'javascript_parsed', - 'value' => 'a:16:{i:0;s:14:"misc/jquery.js";i:1;s:14:"misc/drupal.js";i:2;s:19:"misc/tableheader.js";s:10:"refresh:fr";s:7:"waiting";s:10:"refresh:zu";s:7:"waiting";i:3;s:17:"misc/tabledrag.js";i:4;s:32:"sites/all/modules/cck/content.js";i:5;s:16:"misc/textarea.js";i:6;s:16:"misc/collapse.js";i:7;s:12:"misc/form.js";i:8;s:19:"misc/tableselect.js";i:9;s:20:"modules/user/user.js";i:10;s:20:"misc/autocomplete.js";i:11;s:19:"misc/jquery.form.js";i:12;s:12:"misc/ahah.js";i:13;s:14:"misc/teaser.js";}', + 'value' => 'a:17:{i:0;s:14:"misc/jquery.js";i:1;s:14:"misc/drupal.js";i:2;s:19:"misc/tableheader.js";s:10:"refresh:fr";s:7:"waiting";s:10:"refresh:zu";s:7:"waiting";i:3;s:17:"misc/tabledrag.js";i:4;s:32:"sites/all/modules/cck/content.js";i:5;s:16:"misc/textarea.js";i:6;s:16:"misc/collapse.js";i:7;s:12:"misc/form.js";i:8;s:19:"misc/tableselect.js";i:9;s:20:"modules/user/user.js";i:10;s:20:"misc/autocomplete.js";i:11;s:19:"misc/jquery.form.js";i:12;s:12:"misc/ahah.js";i:13;s:14:"misc/teaser.js";i:14;s:51:"sites/all/modules/i18n/i18ntaxonomy/i18ntaxonomy.js";}', )) ->values(array( 'name' => 'language_content_type_article', @@ -48383,6 +48992,10 @@ 'value' => 's:1:"2";', )) ->values(array( + 'name' => 'language_content_type_story', + 'value' => 's:1:"2";', +)) +->values(array( 'name' => 'language_count', 'value' => 'i:11;', )) @@ -48443,6 +49056,10 @@ 'value' => 'a:1:{i:0;s:6:"status";}', )) ->values(array( + 'name' => 'node_options_story', + 'value' => 'a:2:{i:0;s:6:"status";i:1;s:7:"promote";}', +)) +->values(array( 'name' => 'node_options_test_event', 'value' => 'a:2:{i:0;s:6:"sticky";i:1;s:8:"revision";}', )) @@ -48652,7 +49269,7 @@ )) ->values(array( 'name' => 'upload_story', - 'value' => 'b:1;', + 'value' => 's:1:"1";', )) ->values(array( 'name' => 'upload_test_event', diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php index 80bc22126f..29d3c95dce 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php @@ -69,7 +69,7 @@ protected function getEntityCounts() { 'file' => 8, 'filter_format' => 7, 'image_style' => 5, - 'language_content_settings' => 3, + 'language_content_settings' => 10, 'migration' => 105, 'node' => 17, // The 'book' module provides the 'book' node type, and the migration diff --git a/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml b/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml index 2c482e2f32..2206cfb57a 100644 --- a/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml +++ b/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml @@ -51,6 +51,21 @@ process: 'settings/handler_settings/target_bundles/0': '@field_name' 'settings/handler_settings/auto_create': 'constants/auto_create' required: required + # Get the i18n taxonomy translation setting for this vocabulary. + # 0 - No multilingual options + # 1 - Localizable terms. Run through the localization system. + # 2 - Predefined language for a vocabulary and its terms. + # 3 - Per-language terms, translatable (referencing terms with different + # languages) but not localizable. + translatable: + plugin: static_map + source: i18ntaxonomy_vocabulary + default_value: 0 + map: + 0: false + 1: false + 2: false + 3: true destination: plugin: entity:field_config migration_dependencies: diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php index ba736ea8ac..51fab2d85a 100644 --- a/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php @@ -2,6 +2,8 @@ namespace Drupal\taxonomy\Plugin\migrate\source\d6; +use Drupal\migrate\Row; + /** * Gets all the vocabularies based on the node types that have Taxonomy enabled. * @@ -23,6 +25,26 @@ public function query() { } /** + * + */ + public function prepareRow(Row $row) { + // Get the i18n taxonomy translation setting for this vocabulary. + // 0 - No multilingual options + // 1 - Localizable terms. Run through the localization system. + // 2 - Predefined language for a vocabulary and its terms. + // 3 - Per-language terms, translatable (referencing terms with different + // languages) but not localizable. + $i18ntaxonomy_vocab = $this->variableGet('i18ntaxonomy_vocabulary', NULL); + $vid = $row->getSourceProperty('vid'); + $i18ntaxonomy_vocabulary = FALSE; + if (array_key_exists($vid, $i18ntaxonomy_vocab)) { + $i18ntaxonomy_vocabulary = $i18ntaxonomy_vocab[$vid]; + } + $row->setSourceProperty('i18ntaxonomy_vocabulary', $i18ntaxonomy_vocabulary); + return parent::prepareRow($row); + } + + /** * {@inheritdoc} */ public function getIds() {