Merge "Bug 1733722: Render session messages before calling templates"

htdocs/auth/session.php

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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