diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install index 9de772d..5f7effe 100644 --- a/core/modules/comment/comment.install +++ b/core/modules/comment/comment.install @@ -334,6 +334,17 @@ function comment_field_schema($field) { */ /** + * Implements hook_update_dependencies(). + */ +function comment_update_dependencies() { + // Convert Field API to ConfigEntities after: + $dependencies['comment'][8006] = array( + 'field' => 8004, + ); + return $dependencies; +} + +/** * Renames {comment}.language to {comment}.langcode. */ function comment_update_8000() { @@ -566,7 +577,9 @@ function comment_update_8006(&$sandbox) { // Make sure field doesn't already exist. if (!_update_7000_field_read_fields(array('field_name' => $field['field_name']))) { // Create the field. - _update_7000_field_create_field($field); + $field = entity_create('field_entity', $field); + $field->save(); + //_update_7000_field_create_field($field); } // Add the comment field, setting the instance settings to match those for @@ -601,7 +614,9 @@ function comment_update_8006(&$sandbox) { 'weight' => '50', ), ); - _update_7000_field_create_instance($field, $instance); + $instance = entity_create('field_instance', $instance); + $instance->save(); + //_update_7000_field_create_instance($field, $instance); // Prepare defaults for the default and full view modes. $display_options_default = array( diff --git a/core/modules/field/field.install b/core/modules/field/field.install index 87f40a3..5de009b 100644 --- a/core/modules/field/field.install +++ b/core/modules/field/field.install @@ -240,7 +240,7 @@ function field_update_dependencies() { // - The {file_usage}.id column has moved to varchar. 'file' => 8001, // Node comment status have been turned to fields. - 'comment' => 8006, + //'comment' => 8006, ); return $dependencies; } diff --git a/core/modules/user/user.install b/core/modules/user/user.install index dca417c..be34f61 100644 --- a/core/modules/user/user.install +++ b/core/modules/user/user.install @@ -378,6 +378,17 @@ function user_install_picture_field() { */ /** + * Implements hook_update_dependencies(). + */ +function user_update_dependencies() { + $dependencies['user'][8011] = array( + // - Create a UUID column for managed files. + 'system' => 8015, + ); + return $dependencies; +} + +/** * The 'Member for' extra field has moved one level up in the array. */ function user_update_8000() {