cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2011-11-22 22:45:24 +00:00
parent db616d347a
commit 0033fcbf12
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/views/site/edit.html.erb
View file

@ -6,9 +6,8 @@
</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? %>

2
app/views/user/account.html.erb
View file

@ -129,7 +129,7 @@
<% 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/>