Issue #3210342: EntityModerationForm redirect doesn't allow for moderation state changes in entity presave hooks

core/modules/content_moderation/src/Form/EntityModerationForm.php

@@ -159,7 +159,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
 
     $this->messenger()->addStatus($this->t('The moderation state has been updated.'));
 
-    $new_state = $this->moderationInfo->getWorkflowForEntity($entity)->getTypePlugin()->getState($new_state);
+    $new_state = $this->moderationInfo->getWorkflowForEntity($entity)->getTypePlugin()->getState($entity->moderation_state->value);
     // The page we're on likely won't be visible if we just set the entity to
     // the default state, as we hide that latest-revision tab if there is no
     // pending revision. Redirect to the canonical URL instead, since that will