From 7711418a12171bc34112e8b761d2a82e4faaba67 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Mon, 12 Sep 2022 11:26:55 -0400 Subject: [PATCH] Update admin.php ajax response to populate new argument in ProcessController::jsonMessage() --- wire/core/admin.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wire/core/admin.php b/wire/core/admin.php index e991e165..81ea4849 100644 --- a/wire/core/admin.php +++ b/wire/core/admin.php @@ -6,7 +6,7 @@ * This file is designed for inclusion by /site/templates/admin.php template and all the variables * it references are from your template namespace. * - * Copyright 2021 by Ryan Cramer + * Copyright 2022 by Ryan Cramer * * @var Config $config * @var User $user @@ -217,7 +217,10 @@ if($ajax) { $config->js(array('httpHost', 'httpHosts', 'https'), true); if($controller && $controller->isAjax()) { - if(empty($content) && count($notices)) $content = $controller->jsonMessage($notices->last()->text); + if(empty($content) && count($notices)) { + $notice = $notices->last(); /** @var Notice $notice */ + $content = $controller->jsonMessage($notice->text, false, $notice->flags & Notice::allowMarkup); + } echo $content; } else { if(!strlen($content)) $content = '

' . __('The process returned no content.') . '

';