Pull merge.

[yaffs-website] / web / core / modules / block_content / src / BlockContentTypeForm.php

diff --git a/web/core/modules/block_content/src/BlockContentTypeForm.php b/web/core/modules/block_content/src/BlockContentTypeForm.php
index 4e140b19322efceccfdde2417094a344958bdd1a..711cda678b7e1452491ca65328b7b079279ab525 100644 (file)
--- a/web/core/modules/block_content/src/BlockContentTypeForm.php
+++ b/web/core/modules/block_content/src/BlockContentTypeForm.php
@@ -8,7 +8,9 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\language\Entity\ContentLanguageSettings;
 
 /**
- * Base form for category edit forms.
+ * The block content type entity form.
+ *
+ * @internal
  */
 class BlockContentTypeForm extends BundleEntityFormBase {
 
@@ -98,12 +100,12 @@ class BlockContentTypeForm extends BundleEntityFormBase {
     $edit_link = $this->entity->link($this->t('Edit'));
     $logger = $this->logger('block_content');
     if ($status == SAVED_UPDATED) {
-      drupal_set_message(t('Custom block type %label has been updated.', ['%label' => $block_type->label()]));
+      $this->messenger()->addStatus(t('Custom block type %label has been updated.', ['%label' => $block_type->label()]));
       $logger->notice('Custom block type %label has been updated.', ['%label' => $block_type->label(), 'link' => $edit_link]);
     }
     else {
       block_content_add_body_field($block_type->id());
-      drupal_set_message(t('Custom block type %label has been added.', ['%label' => $block_type->label()]));
+      $this->messenger()->addStatus(t('Custom block type %label has been added.', ['%label' => $block_type->label()]));
       $logger->notice('Custom block type %label has been added.', ['%label' => $block_type->label(), 'link' => $edit_link]);
     }