Merge remote-tracking branch 'upstream/pull/2448'

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 1c8f1c5da4293105c06200e2b29647b8395a7d05..669e0fe6dee4358452740c2540c041080d4cb0c7 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,6 +1,6 @@
 <h4>
   <% if common_details.changeset.tags['comment'].present? %>
-    <%= linkify(h(common_details.changeset.tags["comment"])) %>
+    <%= linkify(common_details.changeset.tags["comment"]) %>
   <% else %>
     <%= t "browse.no_comment" %>
   <% end %>
@@ -15,7 +15,7 @@
 
 <div class="details">
   <%= t "browse.version" %>
-  #<%= h(common_details.version) %>
+  #<%= common_details.version %>
   &middot;
   <%= t "browse.in_changeset" %>
   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>

diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index ba05c1fe427471e805464e210fe4719df3921746..06220a97ddb9267b471e2aaea31a86273b0a5463 100644 (file)
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,7 +1,7 @@
-<li><%= linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
+<li><%= linked_name = link_to printable_name(containing_relation.relation), :action => "relation", :id => containing_relation.relation.id.to_s
         if containing_relation.member_role.blank?
           t ".entry_html", :relation_name => linked_name
         else
-          t ".entry_role_html", :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
+          t ".entry_role_html", :relation_name => linked_name, :relation_role => containing_relation.member_role
         end %>
 </li>

diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index fe0f363574e0e0904023d4bc1c91f08aa617b16d..51b2bb3e6dd05cc288f38c1cda03a64a029a4c4a 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -5,6 +5,6 @@
   <%= if relation_member.member_role.blank?
         t ".entry_html", :type => type_str, :name => linked_name
       else
-        t ".entry_role_html", :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
+        t ".entry_role_html", :type => type_str, :name => linked_name, :role => relation_member.member_role
       end %>
 </li>

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 9b68a03e79b46af71c6af4c825d908a10e0b043a..3c41dd83fefd32a482b43e07568e6cdcdb4ce286 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -6,7 +6,7 @@
 </h2>
 
 <div class="browse-section">
-  <h6><%= linkify(h(@changeset.tags["comment"].to_s.presence || t("browse.no_comment"))) %></h6>
+  <h6><%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %></h6>
   <div class="details"><%= changeset_details(@changeset) %></div>
 
   <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
@@ -38,7 +38,7 @@
                   <%= t(".commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),
-                        :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
+                        :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %>
                   <% if current_user and current_user.moderator? %>
                     — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span>
                   <% end %>
@@ -51,7 +51,7 @@
                   <%= t(".hidden_commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),
-                        :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
+                        :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %>
                   — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
                  </small>
                 <%= comment.body.to_html %>

diff --git a/app/views/changesets/index.atom.builder b/app/views/changesets/index.atom.builder
index b1fbd6992aa14c3ddd4d2e9c65a7c9bc9621093f..2bbae2cc277a9cd4d1172319351e4261de8065ed 100644 (file)
--- a/app/views/changesets/index.atom.builder
+++ b/app/views/changesets/index.atom.builder
@@ -24,9 +24,9 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
                  :type => "application/osmChange+xml"
 
       if !changeset.tags.empty? && changeset.tags.key?("comment")
-        entry.title t("browse.changeset.feed.title_comment", :id => h(changeset.id), :comment => h(changeset.tags["comment"])), :type => "html"
+        entry.title t("browse.changeset.feed.title_comment", :id => changeset.id, :comment => changeset.tags["comment"]), :type => "html"
       else
-        entry.title t("browse.changeset.feed.title", :id => h(changeset.id))
+        entry.title t("browse.changeset.feed.title", :id => changeset.id)
       end
 
       if changeset.user.data_public?
@@ -51,7 +51,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
             table.tr do |tr|
               tr.th t("browse.changeset.belongs_to")
               tr.td do |td|
-                td.a h(changeset.user.display_name), :href => user_url(changeset.user, :only_path => false)
+                td.a changeset.user.display_name, :href => user_url(changeset.user, :only_path => false)
               end
             end
           end
@@ -62,7 +62,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
                 td.table :cellpadding => "0" do |tag_table|
                   changeset.tags.sort.each do |tag|
                     tag_table.tr do |tag_tr|
-                      tag_tr.td << "#{h(tag[0])} = #{linkify(h(tag[1]))}"
+                      tag_tr.td << "#{tag[0]} = #{linkify(tag[1])}"
                     end
                   end
                 end

diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index 3893072adc11cfb58f73d0dbdd3f353f7c5b0b16..db48478263968d0103adc44727c3706bdfabe036 100644 (file)
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,6 +1,6 @@
 <div class="clearfix diary-comment<%= " deemphasize" unless diary_comment.visible? %>">
   <%= user_thumbnail diary_comment.user %>
-  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to h(diary_comment.user.display_name), user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
+  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
     <% if current_user and diary_comment.user.id != current_user.id %>
       | <%= report_link(t(".report"), diary_comment) %>
     <% end %>

diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index 5508817a81e47bf4868ba487fe24a64c958de66a..b0c464718011160ada4c5990be1faf64e3849f2d 100644 (file)
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -4,10 +4,10 @@
       <%= user_thumbnail diary_entry.user %>
     <% end %>
 
-    <h2><%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %></h2>
+    <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
 
     <small class='deemphasize'>
-      <%= t(".posted_by_html", :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>
+      <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>
     </small>
 
   </div>

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index a599aea177468c9122af638012788f22c3260394..32a4e1e0fb7154f32f2f8b8d0789f84e122a8968 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -3,7 +3,7 @@
     <% if @user %>
       <%= user_image @user %>
     <% end %>
-    <h1><%= h(@title) %></h1>
+    <h1><%= @title %></h1>
 
     <ul class='secondary-actions clearfix'>
       <% unless params[:friends] or params[:nearby] -%>

diff --git a/app/views/messages/_message_summary.html.erb b/app/views/messages/_message_summary.html.erb
index 057a8980a5315318add12b7224f1dd2428e4c008..3b732f7befd415552bf9fabbeac2ef44b4861646 100644 (file)
--- a/app/views/messages/_message_summary.html.erb
+++ b/app/views/messages/_message_summary.html.erb
@@ -1,6 +1,6 @@
 <tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" unless message_summary.message_read? %>">
-  <td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), user_path(message_summary.sender) %></td>
-  <td class="inbox-subject"><%= link_to h(message_summary.title), message_path(message_summary) %></td>
+  <td class="inbox-sender"><%= link_to message_summary.sender.display_name, user_path(message_summary.sender) %></td>
+  <td class="inbox-subject"><%= link_to message_summary.title, message_path(message_summary) %></td>
   <td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>
   <td class="inbox-mark-unread"><%= button_to t(".unread_button"), message_mark_path(message_summary, :mark => "unread"), :remote => true %></td>
   <td class="inbox-mark-read"><%= button_to t(".read_button"), message_mark_path(message_summary, :mark => "read"), :remote => true %></td>

diff --git a/app/views/messages/_sent_message_summary.html.erb b/app/views/messages/_sent_message_summary.html.erb
index d3f3227e5c19f26ede099826618daa461540b3b2..ba18ca875c018c9d271ff474f7d9711c24db8eda 100644 (file)
--- a/app/views/messages/_sent_message_summary.html.erb
+++ b/app/views/messages/_sent_message_summary.html.erb
@@ -1,6 +1,6 @@
 <tr class="inbox-row">
-  <td class="inbox-sender"><%= link_to h(sent_message_summary.recipient.display_name), user_path(sent_message_summary.recipient) %></td>
-  <td class="inbox-subject"><%= link_to h(sent_message_summary.title), message_path(sent_message_summary) %></td>
+  <td class="inbox-sender"><%= link_to sent_message_summary.recipient.display_name, user_path(sent_message_summary.recipient) %></td>
+  <td class="inbox-subject"><%= link_to sent_message_summary.title, message_path(sent_message_summary) %></td>
   <td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
   <td class="inbox-destroy"><%= button_to t(".destroy_button"), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true %></td>
 </tr>

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index ea4f5e40df5e2f0473cf4cdc49ba7c9f41b3ca35..7cf674fefd678b4ed21792b0e1e9f2ac8f479ff1 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -1,11 +1,11 @@
 <% if current_user == @message.recipient %>
   <% content_for :heading do %>
-    <h2><%= h(@message.title) %></h2>
+    <h2><%= @message.title %></h2>
   <% end %>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.sender %>
-    <%= link_to h(@message.sender.display_name), user_path(@message.sender) %></td>
+    <%= link_to @message.sender.display_name, user_path(@message.sender) %></td>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
@@ -22,11 +22,11 @@
 
 <% else %>
 
-  <h2><%= h(@message.title) %></h2>
+  <h2><%= @message.title %></h2>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.recipient %>
-    <%= link_to h(@message.recipient.display_name), user_path(@message.recipient) %></td>
+    <%= link_to @message.recipient.display_name, user_path(@message.recipient) %></td>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index 473d0aa39e614fdabe35c577200fa0377cbbb68e..8c662ef8750b4b3c3865d3b32d9fdb794157faef 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -26,7 +26,7 @@
       <br />
       <%= trace.description %>
     <br />
-    <%= t ".by" %> <%= link_to h(trace.user.display_name), user_path(trace.user) %>
+    <%= t ".by" %> <%= link_to trace.user.display_name, user_path(trace.user) %>
     <% if !trace.tags.empty? %>
       <%= t ".in" %>
       <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>

diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index 6583e32f1f5cdc2aeec545858a3d4459abecb37d..e3771bac0b225d3390860c3ae5593cb6960d778c 100644 (file)
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t ".heading", :name => h(@trace.name) %></h2>
+  <h2><%= t ".heading", :name => @trace.name %></h2>
 <% end %>
 
 <img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">
@@ -32,7 +32,7 @@
   <% end %>
     <div class='standard-form-row'>
       <label class='standard-label'><%= t ".owner" %></label>
-      <p class='deemphasize'><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></p>
+      <p class='deemphasize'><%= link_to @trace.user.display_name, user_path(@trace.user) %></p>
     </div>
     <div class='standard-form-row'>
       <label class='standard-label'><%= t ".description" %></label>

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index d2f22c0695ee0e17e25e6e196560c4a27b578550..86ac37f00fe44040982e090fff994d1b2c281a0b 100644 (file)
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h1><%= h(@title) %></h1>
+  <h1><%= @title %></h1>
   <ul class='secondary-actions clearfix'>
     <li><%= t(".description") %></li>
     <li><%= rss_link_to :action => "georss", :display_name => @display_name, :tag => @tag %></li>

diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb
index e049797a864127ea8a0a164613fba02c4e0f7980..e652453695b30a8942b5df14fd3420b110db9260 100644 (file)
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t ".heading", :name => h(@trace.name) %></h2>
+  <h2><%= t ".heading", :name => @trace.name %></h2>
 <% end %>
 
 <% if Settings.status != "gpx_offline" %>
@@ -30,11 +30,11 @@
   <% end %>
   <tr>
     <td><%= t ".owner" %></td>
-    <td><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></td>
+    <td><%= link_to @trace.user.display_name, user_path(@trace.user) %></td>
   </tr>
   <tr>
     <td><%= t ".description" %></td>
-    <td><%= h(@trace.description) %></td>
+    <td><%= @trace.description %></td>
   </tr>
   <tr>
     <td><%= t ".tags" %></td>

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index 49619a9c1c03cf7bd16d9175621417a45f2d2be5..b309e9e119bd661b023b05fc2a5d537739b91dd7 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -1,9 +1,9 @@
 <tr>
   <% if show_user_name %>
-  <td><%= link_to h(block.user.display_name), user_path(block.user) %></td>
+  <td><%= link_to block.user.display_name, user_path(block.user) %></td>
   <% end %>
   <% if show_creator_name %>
-  <td><%= link_to h(block.creator.display_name), user_path(block.creator) %></td>
+  <td><%= link_to block.creator.display_name, user_path(block.creator) %></td>
   <% end %>
   <td><%= h truncate(block.reason) %></td>
   <td><%= h block_status(block) %></td>
@@ -11,7 +11,7 @@
     <% if block.revoker_id.nil? %>
       <%= t(".not_revoked") %>
     <% else %>
-      <%= link_to h(block.revoker.display_name), user_path(block.revoker) %>
+      <%= link_to block.revoker.display_name, user_path(block.revoker) %>
     <% end %>
   </td>
   <td><%= link_to t(".show"), block %></td>

diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index 3275c003cef889d2aff8a09265ce78b91d94ec32..e82711a4ee3292a92bf2bc464966e703094e09f2 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -5,5 +5,5 @@
 <% unless @user_blocks.empty? %>
 <%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => false, :show_creator_name => true } %>
 <% 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/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index df48747dd2bff4e9a452191b2a7a6ea048c6aad6..ce14bf0d2df08b67d8dacf94c4c08640a3d4677b 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,6 +1,6 @@
 <% @title = t(".title",
-              :block_on => h(@user_block.user.display_name),
-              :block_by => h(@user_block.creator.display_name)) %>
+              :block_on => @user_block.user.display_name,
+              :block_by => @user_block.creator.display_name) %>
 
 <% content_for :heading do %>
   <h1><%= t(".heading_html",

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 6bfb412efce4813a17642f0f245acbac43e39a08..69207d4e47e453a2ad08db84302b35d306475c45 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -24,7 +24,7 @@
 <% if @user_block.revoker %>
 <p>
   <b><%= t ".revoker" %></b>
-  <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
+  <%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %>
 </p>
 <% end %>
 

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index 1479a1e4fbbd652e4f64021efed01a1f1bf963b4..8379bcd07a22c17391d485c7324855c830706127 100644 (file)
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -8,7 +8,7 @@
   <%= user_thumbnail contact %>
   <div class='activity-details'>
     <p class='deemphasize'>
-      <%= link_to h(contact.display_name), user_path(contact) %>
+      <%= link_to contact.display_name, user_path(contact) %>
       <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
         <% distance = @user.distance(contact) %>
         <% if distance < 1 %>

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 801755556b69df054198c203b13aa9967bfd9db0..399ef8dcd89843d0c7603152b6b8ec99a5b95947 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -6,12 +6,12 @@
     <p>
       <% if user.creation_ip %>
         <%= t "users.index.summary_html",
-              :name => link_to(h(user.display_name), user_path(user)),
+              :name => link_to(user.display_name, user_path(user)),
               :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
               :date => l(user.creation_time, :format => :friendly) %>
       <% else %>
         <%= t "users.index.summary_no_ip_html",
-              :name => link_to(h(user.display_name), user_path(user)),
+              :name => link_to(user.display_name, user_path(user)),
               :date => l(user.creation_time, :format => :friendly) %>
       <% end %>
     </p>