summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2017-02-27 23:06:50 (GMT)
committerAlex Pott2017-02-27 23:06:50 (GMT)
commitf572d837b47569df4b3c163909aba5a56ed04ff4 (patch)
tree47e71e0b9f5e790b083c24e2827e7b6a8eedd17d
parent973e6b4f16faf3d0557663f896f96695d78870cf (diff)
Revert "Issue #2855428 by Sam152, jhedstrom, timmillwood: Workflow state and transition add/edit form IDs have a '-' in them"
This reverts commit 973e6b4f16faf3d0557663f896f96695d78870cf.
-rw-r--r--core/lib/Drupal/Core/Entity/EntityForm.php2
-rw-r--r--core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php5
2 files changed, 1 insertions, 6 deletions
diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php
index 80e1f8c..b4f6bd6 100644
--- a/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -90,7 +90,7 @@ class EntityForm extends FormBase implements EntityFormInterface {
$form_id .= '_' . $this->entity->bundle();
}
if ($this->operation != 'default') {
- $form_id = $form_id . '_' . str_replace('-', '_', $this->operation);
+ $form_id = $form_id . '_' . $this->operation;
}
return $form_id . '_form';
}
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
index 8aa31caf..15fd234 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
@@ -97,11 +97,6 @@ class EntityFormTest extends UnitTestCase {
'bundle' => '',
'operation' => 'delete',
)),
- array('workflow_edit_state_form', array(
- 'entity_type' => 'workflow',
- 'bundle' => '',
- 'operation' => 'edit-state',
- )),
);
}