Verified Commit 7f99ea2f authored by Dave Long's avatar Dave Long
Browse files

SA-CORE-2024-003 by jrb, larowlan, catch, mingsong, poker10, longwave, benjifisher

parent dd90bb90
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@

namespace Drupal\Core\Ajax;

use Drupal\Component\Render\MarkupInterface;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Asset\AttachedAssets;

/**
@@ -68,7 +70,7 @@ class MessageCommand implements CommandInterface, CommandWithAttachedAssetsInter
  /**
   * The message text.
   *
   * @var string
   * @var string|\Drupal\Component\Render\MarkupInterface
   */
  protected $message;

@@ -96,7 +98,7 @@ class MessageCommand implements CommandInterface, CommandWithAttachedAssetsInter
  /**
   * Constructs a MessageCommand object.
   *
   * @param string $message
   * @param string|\Drupal\Component\Render\MarkupInterface $message
   *   The text of the message.
   * @param string|null $wrapper_query_selector
   *   The query selector of the element to display messages in when they
@@ -120,7 +122,9 @@ public function __construct($message, $wrapper_query_selector = NULL, array $opt
  public function render() {
    return [
      'command' => 'message',
      'message' => $this->message,
      'message' => $this->message instanceof MarkupInterface
        ? (string) $this->message
        : Xss::filterAdmin($this->message),
      'messageWrapperQuerySelector' => $this->wrapperQuerySelector,
      'messageOptions' => $this->options,
      'clearPrevious' => $this->clearPrevious,