mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-06-29 07:59:31 +02:00
Merge branch '4.6' into 4
This commit is contained in:
commit
ab50e2cc51
|
@ -939,6 +939,8 @@ class Security extends Controller implements TemplateGlobalProvider
|
|||
// We've displayed the message in the form output, so reset it for the next run.
|
||||
static::clearSessionMessage();
|
||||
|
||||
// Ensure title is present - in case getResponseController() didn't return a page controller
|
||||
$fragments = array_merge($fragments, ['Title' => $title]);
|
||||
if ($message) {
|
||||
$messageResult = [
|
||||
'Content' => DBField::create_field('HTMLFragment', $message),
|
||||
|
|
Loading…
Reference in New Issue
Block a user