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

Avoid double-escaping display names when sent through the translation system

Browse source 
They are escaped properly without the h() call, and doing that just double-escapes them
This commit is contained in:
Andy Allan 2020-01-08 19:07:18 +01:00
parent 17ecde019d
commit bff3676d93
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/diary_entries/show.html.erb
View file

@ -1,7 +1,7 @@
<% content_for :heading do %>
<div id="userinformation">
<%= user_image @entry.user %>
<h2><%= link_to t(".user_title", :user => h(@entry.user.display_name)), :action => :index %></h2>
<h2><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h2>
<p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
</div>
<% end %>

2
app/views/messages/new.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h2><%= t(".send_message_to_html", :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %></h2>
<h2><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, user_path(@message.recipient))) %></h2>
<% end %>
<%= error_messages_for "message" %>

4
app/views/user_blocks/blocks_by.html.erb
View file

@ -1,4 +1,4 @@
<% @title = t(".title", :name => h(@user.display_name)) %>
<% @title = t(".title", :name => @user.display_name) %>
<% content_for :heading do %>
<h1><%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %></h1>
<% end %>
@ -6,5 +6,5 @@
<% unless @user_blocks.empty? %>
<%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => true, :show_creator_name => false } %>
<% else %>
<p><%= t ".empty", :name => h(@user.display_name) %></p>
<p><%= t ".empty", :name => @user.display_name %></p>
<% end %>

4
app/views/user_blocks/edit.html.erb
View file

@ -1,4 +1,4 @@
<% @title = t ".title", :name => h(@user_block.user.display_name) %>
<% @title = t ".title", :name => @user_block.user.display_name %>
<% content_for :heading do %>
<h1><%= t(".heading_html",
:name => link_to(@user_block.user.display_name,
@ -13,7 +13,7 @@
<%= f.error_messages %>
<p>
<%= f.label :reason, t(".reason", :name => h(@user_block.user.display_name)) %><br />
<%= f.label :reason, t(".reason", :name => @user_block.user.display_name) %><br />
<%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
</p>
<p>

2
app/views/user_blocks/new.html.erb
View file

@ -1,4 +1,4 @@
<% @title = t ".title", :name => h(@user.display_name) %>
<% @title = t ".title", :name => @user.display_name %>
<% content_for :heading do %>
<h1><%= t(".heading_html",
:name => link_to(@user.display_name,

4
app/views/users/no_such_user.html.erb
View file

@ -1,4 +1,4 @@
<% content_for :heading do %>
<h1><%= t ".heading", :user => h(@not_found_user) %></h1>
<h1><%= t ".heading", :user => @not_found_user %></h1>
<% end %>
<p><%= t ".body", :user => h(@not_found_user) %></p>
<p><%= t ".body", :user => @not_found_user %></p>