From 5014c618f077e6d4b042971cdb967566bc5e868b Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 25 May 2018 13:59:22 +0200
Subject: [PATCH] Minor - fix flash template messages

---
 src/CoreBundle/EventListener/LegacyListener.php            | 3 ++-
 .../Resources/views/FlashMessage/render.html.twig          | 7 +++++++
 .../Resources/views/Layout/layout_one_col.html.twig        | 3 ---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/CoreBundle/EventListener/LegacyListener.php b/src/CoreBundle/EventListener/LegacyListener.php
index 60c84b3319..32a49e4f78 100644
--- a/src/CoreBundle/EventListener/LegacyListener.php
+++ b/src/CoreBundle/EventListener/LegacyListener.php
@@ -48,9 +48,10 @@ class LegacyListener
         $container->get('router.default')->setContext($context);*/
 
         // Setting container
+        Container::setRequest($request);
         Container::setContainer($container);
         Container::setLegacyServices($container);
-        Container::setRequest($request);
+
 
         // Legacy way of detect current access_url
         $installed = $container->getParameter('installed');
diff --git a/src/ThemeBundle/Resources/views/FlashMessage/render.html.twig b/src/ThemeBundle/Resources/views/FlashMessage/render.html.twig
index a848afcb1e..980e434c5c 100644
--- a/src/ThemeBundle/Resources/views/FlashMessage/render.html.twig
+++ b/src/ThemeBundle/Resources/views/FlashMessage/render.html.twig
@@ -1,4 +1,9 @@
+{% autoescape false %}
 
+{# Legacy chamilo messages #}
+{{ flash_messages }}
+
+{# new flash messages when using controller #}
 {% for type in sonata_flashmessages_types() %}
     {% set domain = domain is defined ? domain : null %}
     {% for message in sonata_flashmessages_get(type, domain) %}
@@ -12,3 +17,5 @@
         {% endif %}
     {% endfor %}
 {% endfor %}
+
+{% endautoescape %}
diff --git a/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig b/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig
index ee69ed2679..08e8043363 100644
--- a/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig
@@ -45,10 +45,7 @@
                     {% endif %}
 
                     {% block chamilo_messages %}
-                    {% autoescape false %}
-                    {{ flash_messages }}
                     {% include '@ChamiloTheme/FlashMessage/render.html.twig' %}
-                    {% endautoescape %}
                     {% endblock %}
 
                     {# Content #}