From 772ee99c17fe94cb0882f46adc2579832e5d4426 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 10 Nov 2016 09:52:23 +0100
Subject: [PATCH] SONAR-8248 Fix SSF-51 Item 2 (#1376)

---
 server/sonar-web/src/main/js/libs/application.js          | 2 +-
 .../webapp/WEB-INF/app/views/layouts/_footer.html.erb     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/sonar-web/src/main/js/libs/application.js b/server/sonar-web/src/main/js/libs/application.js
index 95e2b9685d5..c0202aa1bee 100644
--- a/server/sonar-web/src/main/js/libs/application.js
+++ b/server/sonar-web/src/main/js/libs/application.js
@@ -28,7 +28,7 @@
    * @param {string} message
    */
   window.showMessage = function (id, message) {
-    jQuery('#' + id + 'msg').html(message);
+    jQuery('#' + id + 'msg').text(message);
     jQuery('#' + id).removeClass('hidden');
     jQuery('#messages-panel').removeClass('hidden');
   };
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb
index cccfd95447c..71f1c60dedb 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb
@@ -10,15 +10,15 @@
 
 <% if cookies['flash'] %>
   <script>
-    var data = JSON.parse(unescape('<%= escape_javascript(cookies['flash']) -%>'));
+    var data = JSON.parse('<%= escape_javascript cookies['flash'] -%>');
     if (data['notice']) {
-      info(data['notice'].toString().replace(/\+/g, ' '));
+      info(data['notice']);
     }
     if (data['warning']) {
-      warning(data['warning'].toString().replace(/\+/g, ' '));
+      warning(data['warning']);
     }
     if (data['error']) {
-      error(data['error'].toString().replace(/\+/g, ' '));
+      error(data['error']);
     }
   </script>
 <% end %>
-- 
2.39.5