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

[yaffs-website] / web / core / lib / Drupal / Core / Entity / ContentEntityDeleteForm.php

diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php b/web/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php
index 32c48d8a03d16df20b84a78fa0f525350f2bfc11..27dd2b7d79dba656ba265c3d56ba02701504820c 100644 (file)
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php
@@ -39,7 +39,7 @@ class ContentEntityDeleteForm extends ContentEntityConfirmFormBase {
         $form['deleted_translations'] = [
           '#theme' => 'item_list',
           '#title' => $this->t('The following @entity-type translations will be deleted:', [
-            '@entity-type' => $entity->getEntityType()->getLowercaseLabel()
+            '@entity-type' => $entity->getEntityType()->getLowercaseLabel(),
           ]),
           '#items' => $languages,
         ];
@@ -60,6 +60,7 @@ class ContentEntityDeleteForm extends ContentEntityConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $this->getEntity();
+    $message = $this->getDeletionMessage();
 
     // Make sure that deleting a translation does not delete the whole entity.
     if (!$entity->isDefaultTranslation()) {
@@ -73,7 +74,7 @@ class ContentEntityDeleteForm extends ContentEntityConfirmFormBase {
       $form_state->setRedirectUrl($this->getRedirectUrl());
     }
 
-    drupal_set_message($this->getDeletionMessage());
+    $this->messenger()->addStatus($message);
     $this->logDeletionMessage();
   }