diff options
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/field.form.inc | 4 | ||||
| -rw-r--r-- | modules/field/modules/options/options.test | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index fd7bedbb4..b5be9224c 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -153,7 +153,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form, $title = check_plain(t($instance['label'])); $description = field_filter_xss(t($instance['description'])); - $wrapper_id = drupal_html_class($field_name) . '-add-more-wrapper'; + $wrapper_id = drupal_html_id($field_name . '-add-more-wrapper'); $field_elements = array(); $function = $instance['widget']['module'] . '_field_widget_form'; @@ -241,7 +241,7 @@ function theme_field_multiple_value_form($variables) { $output = ''; if ($element['#cardinality'] > 1 || $element['#cardinality'] == FIELD_CARDINALITY_UNLIMITED) { - $table_id = $element['#field_name'] . '_values'; + $table_id = drupal_html_id($element['#field_name'] . '_values'); $order_class = $element['#field_name'] . '-delta-order'; $required = !empty($element['#required']) ? '<span class="form-required" title="' . t('This field is required. ') . '">*</span>' : ''; diff --git a/modules/field/modules/options/options.test b/modules/field/modules/options/options.test index 6f3a4cd51..8cbfd5bc7 100644 --- a/modules/field/modules/options/options.test +++ b/modules/field/modules/options/options.test @@ -135,7 +135,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { // Display form: with no field data, nothing is checked. $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); - $this->assertNoFieldChecked("edit-card-2-$langcode--0"); + $this->assertNoFieldChecked("edit-card-2-$langcode-0"); $this->assertNoFieldChecked("edit-card-2-$langcode-1"); $this->assertNoFieldChecked("edit-card-2-$langcode-2"); $this->assertRaw('Some dangerous & unescaped <strong>markup</strong>', t('Option text was properly filtered.')); @@ -151,7 +151,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { // Display form: check that the right options are selected. $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); - $this->assertFieldChecked("edit-card-2-$langcode--0"); + $this->assertFieldChecked("edit-card-2-$langcode-0"); $this->assertNoFieldChecked("edit-card-2-$langcode-1"); $this->assertFieldChecked("edit-card-2-$langcode-2"); @@ -166,7 +166,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { // Display form: check that the right options are selected. $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); - $this->assertFieldChecked("edit-card-2-$langcode--0"); + $this->assertFieldChecked("edit-card-2-$langcode-0"); $this->assertNoFieldChecked("edit-card-2-$langcode-1"); $this->assertNoFieldChecked("edit-card-2-$langcode-2"); |