Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / content_moderation / src / Plugin / Field / FieldWidget / ModerationStateWidget.php

diff --git a/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php b/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
index 967dce880a582a9c41601c143be3a51cc376341b..0d4c43a3334329358e97854b33858d834923da75 100644 (file)
--- a/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
+++ b/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
@@ -127,10 +127,13 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
     $transitions = $this->validator->getValidTransitions($entity, $this->currentUser);
 
     $transition_labels = [];
-    $default_value = NULL;
+    $default_value = $items->value;
     foreach ($transitions as $transition) {
       $transition_to_state = $transition->to();
       $transition_labels[$transition_to_state->id()] = $transition_to_state->label();
+      if ($default->id() === $transition_to_state->id()) {
+        $default_value = $default->id();
+      }
     }
 
     $element += [