- Patch #553298 by yched, te-brian, chx, sun: redesign the 'Manage Display' screen.

2 files changed, 19 insertions, 13 deletions

diff --git a/modules/comment/comment.install b/modules/comment/comment.install
index 952392664..b7a249044 100644
--- a/modules/comment/comment.install
+++ b/modules/comment/comment.install
@@ -279,10 +279,12 @@ function comment_update_7012() {
     'label' => 'Comment',
     'entity_type' => 'comment',
     'settings' => array('text_processing' => 1),
-    // Hide field label by default.
+    'required' => TRUE,
     'display' => array(
-      'full' => array(
+      'default' => array(
         'label' => 'hidden',
+        'type' => 'text_default',
+        'weight' => 0,
       ),
     ),
   );
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 945c7e0bc..66ccef6bc 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -108,6 +108,7 @@ function comment_entity_info() {
       'view modes' => array(
         'full' => array(
           'label' => t('Full comment'),
+          'custom settings' => FALSE,
         ),
       ),
       'static cache' => FALSE,
@@ -165,15 +166,17 @@ function comment_field_extra_fields() {
   foreach (node_type_get_types() as $type) {
     if (variable_get('comment_subject_field_' . $type->type, 1) == 1) {
       $return['comment']['comment_node_' . $type->type] = array(
-        'author' => array(
-          'label' => t('Author'),
-          'description' => t('Author textfield'),
-          'weight' => -2,
-        ),
-        'title' => array(
-          'label' => t('Subject'),
-          'description' => t('Subject textfield'),
-          'weight' => -1,
+        'form' => array(
+          'author' => array(
+            'label' => t('Author'),
+            'description' => t('Author textfield'),
+            'weight' => -2,
+          ),
+          'title' => array(
+            'label' => t('Subject'),
+            'description' => t('Subject textfield'),
+            'weight' => -1,
+          ),
         ),
       );
     }
@@ -362,10 +365,11 @@ function _comment_body_field_instance_create($info) {
     'bundle' => 'comment_node_' . $info->type,
     'settings' => array('text_processing' => 1),
     'required' => TRUE,
-    // Hides field label by default.
     'display' => array(
-      'full' => array(
+      'default' => array(
         'label' => 'hidden',
+        'type' => 'text_default',
+        'weight' => 0,
       ),
     ),
   );