From bff3676d9346323cee491243315404fd09879272 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 8 Jan 2020 19:07:18 +0100
Subject: [PATCH] Avoid double-escaping display names when sent through the
 translation system

They are escaped properly without the h() call, and doing that just double-escapes them
---
 app/views/diary_entries/show.html.erb    | 2 +-
 app/views/messages/new.html.erb          | 2 +-
 app/views/user_blocks/blocks_by.html.erb | 4 ++--
 app/views/user_blocks/edit.html.erb      | 4 ++--
 app/views/user_blocks/new.html.erb       | 2 +-
 app/views/users/no_such_user.html.erb    | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index d8f4cd8f5..d3a0f70b2 100644
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -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 %>
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index 2aac33efa..f5d94dc94 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -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" %>
diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index 6b4e60daa..d5283925b 100644
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -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 %>
diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 69ab5f9f3..7b2471eab 100644
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -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>
diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index 18b03eda9..c2832e348 100644
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -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,
diff --git a/app/views/users/no_such_user.html.erb b/app/views/users/no_such_user.html.erb
index 8f94cf372..f181434a3 100644
--- a/app/views/users/no_such_user.html.erb
+++ b/app/views/users/no_such_user.html.erb
@@ -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>
-- 
2.43.2