diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php b/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php index bfb7b91..32f5746 100644 --- a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php +++ b/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php @@ -37,7 +37,7 @@ function formElement(array $items, $delta, array $element, $langcode, array &$fo $display_summary = !empty($items[$delta]['summary']) || $this->instance['settings']['display_summary']; $js = empty($this->instance['settings']['show_summary']) ? array(drupal_get_path('module', 'text') . '/text.js') : array(); - $required = empty($form['#type']) && !empty($this->instance['settings']['required_summary']) ? TRUE : FALSE; + $required = empty($form['#type']) && !empty($this->instance['settings']['required_summary']); $element['summary'] = array( '#type' => $display_summary ? 'textarea' : 'value', diff --git a/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php b/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php index 8e76525..3ee471c 100644 --- a/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php +++ b/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php @@ -199,11 +199,10 @@ function testRequiredSummary() { $this->drupalLogin($this->article_creator); // Create article with summary but empty body. - $summary = $this->randomName(); $edit = array( "title" => $this->randomName(), ); $this->drupalPost('node/add/article', $edit, t('Save')); - $this->assertText('Summary field is required.', 'Article with no summary when summary is required cannot be saved.'); + $this->assertText('Summary field is required.', 'Unable to save article without a required summary.'); } } diff --git a/core/modules/text/text.module b/core/modules/text/text.module index 914aa71..25b46ae 100644 --- a/core/modules/text/text.module +++ b/core/modules/text/text.module @@ -111,14 +111,14 @@ function text_field_instance_settings_form($field, $instance) { $form['show_summary'] = array( '#type' => 'checkbox', '#title' => t('Show Summary'), - '#default_value' => !empty($settings['show_summary']) ? TRUE : FALSE, - '#description' => t('Remove collapse option to who the Summary.'), + '#default_value' => !empty($settings['show_summary']), + '#description' => t('Summary field is always visible.'), ); $form['required_summary'] = array( '#type' => 'checkbox', '#title' => t('Mark Summary as required'), - '#default_value' => !empty($settings['required_summary']) ? TRUE : FALSE, - '#description' => t('Marks the Summary as required.'), + '#default_value' => !empty($settings['required_summary']), + '#description' => t('Mark the Summary as required.'), ); }