diff --git a/core/modules/book/config/node.type.book.yml b/core/modules/book/config/node.type.book.yml index 7ec1e60..426778d 100644 --- a/core/modules/book/config/node.type.book.yml +++ b/core/modules/book/config/node.type.book.yml @@ -1,4 +1,5 @@ type: book +uuid: c5ca890d-7db7-4c45-bf0f-0a12430923ff name: 'Book page' description: 'Books have a built-in hierarchical navigation. Use for handbooks or tutorials.' help: '' diff --git a/core/modules/forum/config/node.type.forum.yml b/core/modules/forum/config/node.type.forum.yml index 1349dda..7ffb0e7 100644 --- a/core/modules/forum/config/node.type.forum.yml +++ b/core/modules/forum/config/node.type.forum.yml @@ -1,4 +1,5 @@ type: forum +uuid: c14b392d-0889-46bd-889e-a239e8b6cd89 name: 'Forum topic' description: 'A forum topic starts a new discussion thread within a forum.' help: '' diff --git a/core/modules/node/lib/Drupal/node/NodeTypeInterface.php b/core/modules/node/lib/Drupal/node/NodeTypeInterface.php index b0f7579..691713b 100644 --- a/core/modules/node/lib/Drupal/node/NodeTypeInterface.php +++ b/core/modules/node/lib/Drupal/node/NodeTypeInterface.php @@ -29,7 +29,7 @@ public function getModuleSettings($module); /** * Returns a locked state of the type. * - * @return string|False + * @return string|false * The module name that locks the type or FALSE. */ public function isLocked(); diff --git a/core/modules/node/node.install b/core/modules/node/node.install index 1ad54e8..d16b875 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -1105,8 +1105,8 @@ function node_update_8020() { update_variable_del($name); } $config->save(); - // Convert 'base' property to state. Note than module could be disabled at - // this time so just preserving the relation. + // Convert the 'base' property to state. Note that we could have disabled + // modules at this time but we still need to preserve the relation. if ($node_type['base'] !== 'node_content') { $locked[$id] = $node_type['base']; } diff --git a/core/modules/node/tests/modules/node_test_config/config/node.type.default.yml b/core/modules/node/tests/modules/node_test_config/config/node.type.default.yml index d960aaf..1e17673 100644 --- a/core/modules/node/tests/modules/node_test_config/config/node.type.default.yml +++ b/core/modules/node/tests/modules/node_test_config/config/node.type.default.yml @@ -1,4 +1,5 @@ type: default +uuid: ca226632-3186-42a2-8440-a526f20840af name: Default description: 'Default description.' help: '' diff --git a/core/modules/node/tests/modules/node_test_config/staging/node.type.import.yml b/core/modules/node/tests/modules/node_test_config/staging/node.type.import.yml index 25552b0..f2a4f4a 100644 --- a/core/modules/node/tests/modules/node_test_config/staging/node.type.import.yml +++ b/core/modules/node/tests/modules/node_test_config/staging/node.type.import.yml @@ -1,4 +1,5 @@ type: import +uuid: 1a720d40-7bcd-41e3-ae4d-08d1cad4ac2a name: Import description: 'Import description.' help: '' diff --git a/core/profiles/standard/config/node.type.article.yml b/core/profiles/standard/config/node.type.article.yml index 4918cfb..4bb97a4 100644 --- a/core/profiles/standard/config/node.type.article.yml +++ b/core/profiles/standard/config/node.type.article.yml @@ -1,4 +1,5 @@ type: article +uuid: 38fcdfbf-92a0-43d3-af30-8395cba668d4 name: Article description: 'Use articles for time-sensitive content like news, press releases or blog posts.' help: '' diff --git a/core/profiles/standard/config/node.type.page.yml b/core/profiles/standard/config/node.type.page.yml index e0d4f79..987f75c 100644 --- a/core/profiles/standard/config/node.type.page.yml +++ b/core/profiles/standard/config/node.type.page.yml @@ -1,4 +1,5 @@ type: page +uuid: f77b56af-2b34-4a2f-b7e9-2dcadfdc80d0 name: 'Basic page' description: 'Use basic pages for your static content, such as an ''About us'' page.' help: ''