Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
e6d78019
Commit
e6d78019
authored
Dec 13, 2017
by
Robert Lyon
Committed by
Gerrit Code Review
Dec 13, 2017
Browse files
Merge "Bug 1733722: Render session messages before calling templates"
parents
1cbf5463
57a02fee
Changes
5
Hide whitespace changes
Inline
Side-by-side
htdocs/auth/session.php
View file @
e6d78019
...
...
@@ -570,7 +570,8 @@ class Session {
*/
function
insert_messages
(
$placement
=
'messages'
)
{
global
$SESSION
;
return
$SESSION
->
render_messages
(
$placement
);
$messages
=
$SESSION
->
render_messages
(
$placement
);
return
(
array
(
$placement
=>
$messages
));
}
...
...
htdocs/lib/web.php
View file @
e6d78019
...
...
@@ -953,6 +953,8 @@ EOF;
require_once
(
'cookieconsent.php'
);
$smarty
->
assign
(
'COOKIECONSENTCODE'
,
get_cookieconsent_code
());
}
// Render the session messages
$smarty
->
assign
(
'messages'
,
insert_messages
(
'messages'
));
return
$smarty
;
}
...
...
htdocs/theme/raw/templates/header.tpl
View file @
e6d78019
...
...
@@ -118,7 +118,7 @@
</div>
{/
if
}
{
dynamic
}{
insert_
messages
}{/
dynamic
}
{
dynamic
}{
$messages.
messages
|
safe
}{/
dynamic
}
{
if
$institutionselector
}
<div
class=
"institutionselector"
>
{
$institutionselector
|
safe
}
...
...
htdocs/theme/raw/templates/login.tpl
View file @
e6d78019
...
...
@@ -9,7 +9,7 @@
</h3>
<div
class=
"panel-body"
>
<noscript><p>
{
str
tag
=
"javascriptnotenabled"
}
</p></noscript>
{
dynamic
}{
insert_
messages
placement
=
'
loginbox
'
}{/
dynamic
}
{
dynamic
}{
$
messages
.
loginbox
|
safe
}{/
dynamic
}
<div
id=
"loginform_container"
>
{
$login_form
|
safe
}
</div>
...
...
htdocs/theme/raw/templates/sideblocks/login.tpl
View file @
e6d78019
...
...
@@ -5,7 +5,7 @@
</h3>
<div
class=
"panel-body"
>
<noscript><p>
{
str
tag
=
"javascriptnotenabled"
}
</p></noscript>
{
dynamic
}{
insert_
messages
placement
=
'
loginbox
'
}{/
dynamic
}
{
dynamic
}{
$
messages
.
loginbox
}{/
dynamic
}
<div
id=
"loginform_container"
>
{
$sbdata.loginform
|
safe
}
</div>
</div>
</div>
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment