Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

merge-requests/9736/merge
Dave Long 2024-11-20 17:59:40 +00:00
parent dd90bb9095
commit 7f99ea2f2c
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Drupal/Core/Ajax/MessageCommand.php
View File

@ -2,6 +2,8 @@
namespace Drupal\Core\Ajax; namespace Drupal\Core\Ajax;
use Drupal\Component\Render\MarkupInterface;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Asset\AttachedAssets; use Drupal\Core\Asset\AttachedAssets;
/** /**
@ -68,7 +70,7 @@ class MessageCommand implements CommandInterface, CommandWithAttachedAssetsInter
/** /**
* The message text. * The message text.
* *
* @var string * @var string|\Drupal\Component\Render\MarkupInterface
*/ */
protected $message; protected $message;
@ -96,7 +98,7 @@ class MessageCommand implements CommandInterface, CommandWithAttachedAssetsInter
/** /**
* Constructs a MessageCommand object. * Constructs a MessageCommand object.
* *
* @param string $message * @param string|\Drupal\Component\Render\MarkupInterface $message
* The text of the message. * The text of the message.
* @param string|null $wrapper_query_selector * @param string|null $wrapper_query_selector
* The query selector of the element to display messages in when they * The query selector of the element to display messages in when they
@ -120,7 +122,9 @@ class MessageCommand implements CommandInterface, CommandWithAttachedAssetsInter
public function render() { public function render() {
return [ return [
'command' => 'message', 'command' => 'message',
'message' => $this->message, 'message' => $this->message instanceof MarkupInterface
? (string) $this->message
: Xss::filterAdmin($this->message),
'messageWrapperQuerySelector' => $this->wrapperQuerySelector, 'messageWrapperQuerySelector' => $this->wrapperQuerySelector,
'messageOptions' => $this->options, 'messageOptions' => $this->options,
'clearPrevious' => $this->clearPrevious, 'clearPrevious' => $this->clearPrevious,