From 1eb7f7517215cc544b65e6a054ce0f7122045232 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 11 May 2011 21:28:56 -0400
Subject: [PATCH] - Patch #1017672 by catch, q0rban: D6 to D7 update process
permanently deletes comment bodies and other data, and throws fatal SQL
errors.
---
modules/node/node.install | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/modules/node/node.install b/modules/node/node.install
index 4a02baa2c484..e322e81c0a41 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -449,5 +449,23 @@ function node_install() {
* @ingroup update-api-7.x-to-8.x
*/
function _update_7000_node_get_types() {
- return db_query('SELECT * FROM {node_type}')->fetchAllAssoc('type', PDO::FETCH_OBJ);
+ $node_types = db_query('SELECT * FROM {node_type}')->fetchAllAssoc('type', PDO::FETCH_OBJ);
+
+ // Create default settings for orphaned nodes.
+ $all_types = db_query('SELECT DISTINCT type FROM {node}')->fetchCol();
+ $extra_types = array_diff($all_types, array_keys($node_types));
+
+ foreach ($extra_types as $type) {
+ $type_object = new stdClass;
+ $type_object->type = $type;
+ // In Drupal 6, whether you have a body field or not is a flag in the node
+ // type table. If it's enabled, nodes may or may not have an empty string
+ // for the bodies. As we can't detect what this setting should be in
+ // Drupal 7 without access to the Drupal 6 node type settings, we assume
+ // the default, which is to enable the body field.
+ $type_object->has_body = 1;
+ $type_object->body_label = 'Body';
+ $node_types[$type_object->type] = $type_object;
+ }
+ return $node_types;
}
--
GitLab