projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further Drupal 8.6.4 changes. Some core files were not committed before a commit...
[yaffs-website]
/
web
/
core
/
lib
/
Drupal
/
Core
/
Render
/
Element
/
StatusMessages.php
diff --git
a/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
b/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
index 530457fd90621fa5c2a2f718cb571c26d6ece32e..d8627343eea01bb766de507d518bd0c139492fa7 100644
(file)
--- a/
web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
+++ b/
web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
@@
-5,7
+5,7
@@
namespace Drupal\Core\Render\Element;
/**
* Provides a messages element.
*
/**
* Provides a messages element.
*
- * Used to display results of
drupal_set_m
essage() calls.
+ * Used to display results of
\Drupal::messenger()->addM
essage() calls.
*
* Usage example:
* @code
*
* Usage example:
* @code
@@
-61,7
+61,8
@@
class StatusMessages extends RenderElement {
*
* @param string|null $type
* Limit the messages returned by type. Defaults to NULL, meaning all types.
*
* @param string|null $type
* Limit the messages returned by type. Defaults to NULL, meaning all types.
- * Passed on to drupal_get_messages(). These values are supported:
+ * Passed on to \Drupal\Core\Messenger\Messenger::deleteByType(). These
+ * values are supported:
* - NULL
* - 'status'
* - 'warning'
* - NULL
* - 'status'
* - 'warning'
@@
-70,16
+71,23
@@
class StatusMessages extends RenderElement {
* @return array
* A renderable array containing the messages.
*
* @return array
* A renderable array containing the messages.
*
- * @see
drupal_get_messages
()
+ * @see
\Drupal\Core\Messenger\Messenger::deleteByType
()
*/
*/
- public static function renderMessages($type) {
+ public static function renderMessages($type
= NULL
) {
$render = [];
$render = [];
- $messages = drupal_get_messages($type);
+ if (isset($type)) {
+ $messages = [
+ $type => \Drupal::messenger()->deleteByType($type),
+ ];
+ }
+ else {
+ $messages = \Drupal::messenger()->deleteAll();
+ }
+
if ($messages) {
// Render the messages.
$render = [
'#theme' => 'status_messages',
if ($messages) {
// Render the messages.
$render = [
'#theme' => 'status_messages',
- // @todo Improve when https://www.drupal.org/node/2278383 lands.
'#message_list' => $messages,
'#status_headings' => [
'status' => t('Status message'),
'#message_list' => $messages,
'#status_headings' => [
'status' => t('Status message'),