diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php index d1430e374f7..f2257f30a0e 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php @@ -202,7 +202,7 @@ class FieldInstanceEditForm extends FormBase { $destination = drupal_get_destination(); $request->query->remove('destination'); } - $form_state['redirect'] = array('admin/structure/types/manage/' . $this->instance['bundle'] . '/fields/' . $this->instance->id() . '/delete', array('query' => $destination)); + $form_state['redirect'] = array('admin/structure/types/manage/' . $this->instance->bundle . '/fields/' . $this->instance->id() . '/delete', array('query' => $destination)); } /** diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php index 1a8f65e5e4e..097820d94e8 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php @@ -74,6 +74,7 @@ class ManageFieldsTest extends FieldUiTestBase { $this->addExistingField(); $this->cardinalitySettings(); $this->fieldListAdminPage(); + $this->deleteFieldInstance(); } /** @@ -208,6 +209,17 @@ class ManageFieldsTest extends FieldUiTestBase { $this->assertFieldByXPath("//input[@name='field[cardinality_number]']", 1); } + /** + * Tests deleting a field from the instance edit form. + */ + protected function deleteFieldInstance() { + // Delete the field instance. + $instance_id = 'node.' . $this->type . '.' . $this->field_name; + $this->drupalGet('admin/structure/types/manage/' . $this->type . '/fields/' . $instance_id); + $this->drupalPostForm(NULL, array(), t('Delete field')); + $this->assertResponse(200); + } + /** * Asserts field settings are as expected. *