Commit baaec238 authored by Robert Lyon's avatar Robert Lyon

Bug 1733722: Render session messages before calling templates

Accidentially merged earlier version of patch so was missing the
changes to deal with messages to login box

behatnotneeded

Change-Id: Ie3a69df6ecc904a5c41d6f239b92c572bcfc6da3
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent e6d78019
......@@ -954,7 +954,10 @@ EOF;
$smarty->assign('COOKIECONSENTCODE', get_cookieconsent_code());
}
// Render the session messages
$smarty->assign('messages', insert_messages('messages'));
$messages = array();
$messages = array_merge($messages, insert_messages('loginbox'));
$messages = array_merge($messages, insert_messages('messages'));
$smarty->assign('messages', $messages);
return $smarty;
}
......
......@@ -5,7 +5,7 @@
</h3>
<div class="panel-body">
<noscript><p>{str tag="javascriptnotenabled"}</p></noscript>
{dynamic}{$messages.loginbox}{/dynamic}
{dynamic}{$messages.loginbox|safe}{/dynamic}
<div id="loginform_container">{$sbdata.loginform|safe}</div>
</div>
</div>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment