From 2819ced91eeac0760ee0722a601ea0f166f10933 Mon Sep 17 00:00:00 2001
From: Evandro Junior <evandrojr@gmail.com>
Date: Thu, 23 Jun 2016 18:10:38 -0300
Subject: [PATCH] Fixed html that was being escaped

---
 lib/proposals_discussion_plugin/topic_helper.rb | 2 +-
 views/content_viewer/discussion.html.erb        | 2 +-
 views/content_viewer/discussion_topics.html.erb | 3 +--
 views/content_viewer/proposal.html.erb          | 7 +++----
 views/content_viewer/topic.html.erb             | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/proposals_discussion_plugin/topic_helper.rb b/lib/proposals_discussion_plugin/topic_helper.rb
index 259b378..9b3e1e7 100644
--- a/lib/proposals_discussion_plugin/topic_helper.rb
+++ b/lib/proposals_discussion_plugin/topic_helper.rb
@@ -6,7 +6,7 @@ module ProposalsDiscussionPlugin::TopicHelper
 
     content_tag(:div, (
       content_tag(:div, '', :class=>'topic-color', :style => "background-color: #{topic.color};") +
-        content_tag(:h2, link_to(image_icon + content_tag(:span, topic.title), topic.view_url))
+        content_tag(:h2, link_to(image_icon.html_safe + content_tag(:span, topic.title), topic.view_url))
     ), :class => 'topic-title')
   end
 
diff --git a/views/content_viewer/discussion.html.erb b/views/content_viewer/discussion.html.erb
index 336c75f..77cc933 100644
--- a/views/content_viewer/discussion.html.erb
+++ b/views/content_viewer/discussion.html.erb
@@ -2,7 +2,7 @@
 <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
 
 <div class="description">
-  <%= discussion.body %>
+  <%= discussion.body.to_s.html_safe %>
 </div>
 
 <div class="phases">
diff --git a/views/content_viewer/discussion_topics.html.erb b/views/content_viewer/discussion_topics.html.erb
index e7b958a..27b0412 100644
--- a/views/content_viewer/discussion_topics.html.erb
+++ b/views/content_viewer/discussion_topics.html.erb
@@ -2,7 +2,7 @@
 <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
 
 <div class="description">
-  <%= discussion.body %>
+  <%= discussion.body.to_s.html_safe %>
 </div>
 
 <% if discussion.allow_create?(user) %>
@@ -27,4 +27,3 @@
     </div>
   <% end %>
 </div>
-
diff --git a/views/content_viewer/proposal.html.erb b/views/content_viewer/proposal.html.erb
index 05aec92..fe24c7f 100644
--- a/views/content_viewer/proposal.html.erb
+++ b/views/content_viewer/proposal.html.erb
@@ -1,7 +1,6 @@
 <span class="created-at">
-  <span class="date"><%= show_date(proposal.published_at) %></span>
-  <span class="author"><%= _(", by %s") % (proposal.author ? link_to(proposal.author_name, proposal.author_url) : proposal.author_name) %></span>
-  <span class="comments"><%= _(" - %s") % link_to_comments(proposal) %></span>
+  <span class="date"><%= show_date(proposal.published_at) %></span><span class="author"><%= _(", by %s").html_safe % (proposal.author ? link_to(proposal.author_name, proposal.author_url) : proposal.author_name) %></span>
+  <span class="comments"><%= _(" - %s").html_safe % link_to_comments(proposal) %></span>
 </span>
 
 <div class="discussion">
@@ -17,7 +16,7 @@
 </div>
 
 <div class="body">
-  <div class="content"><%= proposal.body %></div>
+  <div class="content"><%= proposal.body.to_s.html_safe %></div>
 </div>
 
 <% if proposal.created_by == user && !proposal.published %>
diff --git a/views/content_viewer/topic.html.erb b/views/content_viewer/topic.html.erb
index 8cd0a9c..97823c1 100644
--- a/views/content_viewer/topic.html.erb
+++ b/views/content_viewer/topic.html.erb
@@ -10,7 +10,7 @@
 <div class="topic-content">
 
 <div class="description">
-  <%= topic.body %>
+  <%= topic.body.to_s.html_safe %>
 </div>
 
 <% unless list_view %>
--
libgit2 0.21.2