aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/general/blog.rhtml
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-02-14 18:56:16 +0000
committerLouise Crow <louise.crow@gmail.com>2013-02-14 19:03:40 +0000
commitbc0cc811e80143d0255d86433a80a823d1141dd0 (patch)
tree0c5005b2b03e540d8ab562da06539414709fbc18 /app/views/general/blog.rhtml
parent6fa9c17c7cd5551489a77f6e89543b7886be51d4 (diff)
parent2c5749d4d92e6601856cef6f7e2201d06d885183 (diff)
Merge branch 'release/0.7'0.7.00.7
Diffstat (limited to 'app/views/general/blog.rhtml')
-rw-r--r--app/views/general/blog.rhtml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml
index 5258e9bbd..07d6d2f14 100644
--- a/app/views/general/blog.rhtml
+++ b/app/views/general/blog.rhtml
@@ -26,9 +26,9 @@
<p class="subtitle"><%= _("Posted on {{date}} by {{author}}", :date=>simple_date(Time.parse(item['pubDate'][0])), :author=>item['creator']) %></p>
<div>
<% if item['encoded'] %>
- <%= item['encoded'] %>
+ <%= raw item['encoded'] %>
<% elsif item['description'] %>
- <%= item['description'] %>
+ <%= raw item['description'] %>
<% end %>
</div>
<p><em>