Don't escape HTML in the message shown to anonymous users

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index 37531a4a7782261fdf48e4408ca0e919a17a8ccd..207cbdef4a26eca401f06b1b09bce60350d3f920 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -6,9 +6,8 @@
 </p>
 <% elsif !@user.data_public? %>
 <p><%= t 'site.edit.not_public' %></p>
 </p>
 <% elsif !@user.data_public? %>
 <p><%= t 'site.edit.not_public' %></p>

-<p><%= t 'site.edit.not_public_description', 
-:user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
-<p><%= t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p>
+<p><%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
+<p><%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p>

 <% else %>
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
 <% else %>
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index 0da8b2530d30edf82979e0ac6ed61dbdf80e9963..988cd9121d2981ffff9d5f470163070a9a29aa15 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -129,7 +129,7 @@
 <% unless @user.data_public? %>
 <a name="public"></a>
 <h2><%= t 'user.account.public editing note.heading' %></h2>
 <% unless @user.data_public? %>
 <a name="public"></a>
 <h2><%= t 'user.account.public editing note.heading' %></h2>

-<%= t 'user.account.public editing note.text' %>
+<%= raw t 'user.account.public editing note.text' %>

   <%= button_to t('user.account.make edits public button'), :action => :go_public %>
 <% end %>
 <br/>
   <%= button_to t('user.account.make edits public button'), :action => :go_public %>
 <% end %>
 <br/>