diff --git a/core/modules/book/book.module b/core/modules/book/book.module index bbdfab3..809964f 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -540,13 +540,12 @@ function _book_add_form_elements(&$form, &$form_state, Node $node) { '#collapsed' => TRUE, '#group' => 'additional_settings', '#attributes' => array( - 'class' => array('book-form'), + 'class' => array('book-outline-form'), ), '#attached' => array( 'js' => array(drupal_get_path('module', 'book') . '/book.js'), ), '#tree' => TRUE, - '#attributes' => array('class' => array('book-outline-form')), ); foreach (array('menu_name', 'mlid', 'nid', 'router_path', 'has_children', 'options', 'module', 'original_bid', 'parent_depth_limit') as $key) { $form['book'][$key] = array( diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc index dcb2a8c..f56a653 100644 --- a/core/modules/file/file.field.inc +++ b/core/modules/file/file.field.inc @@ -590,10 +590,9 @@ function file_field_widget_process($element, &$form_state, $form) { // Add the description field if enabled. if (!empty($instance['settings']['description_field']) && $item['fid']) { $element['description'] = array( - '#type' => 'textfield', + '#type' => variable_get('file_description_type', 'textfield'), '#title' => t('Description'), '#value' => isset($item['description']) ? $item['description'] : '', - '#type' => variable_get('file_description_type', 'textfield'), '#maxlength' => variable_get('file_description_length', 128), '#description' => t('The description may be used as the label of the link to the file.'), ); diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php index 715da9c..67f5deb 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php @@ -113,7 +113,6 @@ class LanguageBrowserDetectionUnitTest extends UnitTestBase { '*,fr-CA;q=0.5' => 'en', '*,en;q=0.25' => 'fr-CA', 'en,en-US;q=0.5,fr;q=0.25' => 'en', - 'en-US,en;q=0.5,fr;q=0.25' => 'en-US', // Unresolvable cases. '' => FALSE, diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php index a51b1f9..a992626 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php @@ -40,8 +40,6 @@ class PercentagesUnitTest extends UnitTestBase { '33' => array('total' => 3, 'current' => 1), // 2/3 is closer to 67% than to 66%. '67' => array('total' => 3, 'current' => 2), - // A full 3/3 should equal 100%. - '100' => array('total' => 3, 'current' => 3), // 1/199 should round up to 1%. '1' => array('total' => 199, 'current' => 1), // 198/199 should round down to 99%. diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php index 20d1f56..578ac28 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php @@ -75,7 +75,7 @@ class FormTest extends WebTestBase { $elements['radios']['element'] = array('#title' => $this->randomName(), '#type' => 'radios', '#options' => array('' => t('None'), $this->randomName(), $this->randomName(), $this->randomName())); $elements['radios']['empty_values'] = $empty_arrays; - $elements['checkbox']['element'] = array('#title' => $this->randomName(), '#type' => 'checkbox', '#required' => TRUE, '#title' => $this->randomName()); + $elements['checkbox']['element'] = array('#title' => $this->randomName(), '#type' => 'checkbox', '#required' => TRUE); $elements['checkbox']['empty_values'] = $empty_checkbox; $elements['checkboxes']['element'] = array('#title' => $this->randomName(), '#type' => 'checkboxes', '#options' => array($this->randomName(), $this->randomName(), $this->randomName()));