- Patch #11218 by David_Rothstein, sun, quicksketch, duncf, awood456, dropcube, mgifford | pwolanin, dww, RobRoy, Crell, webchick, beginner, ray007, bjaspan, chx, Gábor Hojtsy, Steven, Dries, lutegrass, sym, guardian, matt2000, geerlingguy, SeanBannister, matt westgate, com2, praseodym: allow default text formats per role, and integrate text format permissions.

1 files changed, 5 insertions, 1 deletions

diff --git a/modules/node/node.install b/modules/node/node.install
index c53bdf8c9..6ac772029 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -506,7 +506,11 @@ function node_update_7006(&$context) {
             $revision->body = substr($revision->body, strlen($break));
           }
           $node->body[FIELD_LANGUAGE_NONE][0]['value'] = $revision->body;
-          $node->body[FIELD_LANGUAGE_NONE][0]['format'] = $revision->format;
+          // Explicitly store the current default text format if the revision
+          // did not have its own text format. Similar conversions for other
+          // core modules are performed in filter_update_7005(), but we do this
+          // one here since we are already migrating the data.
+          $node->body[FIELD_LANGUAGE_NONE][0]['format'] = !empty($revision->format) ? $revision->format : variable_get('filter_default_format', 1);
           // This is a core update and no contrib modules are enabled yet, so
           // we can assume default field storage for a faster update.
           field_sql_storage_field_storage_write('node', $node, FIELD_STORAGE_INSERT, array());