Remove unecessary page title HTML escaping from views (#9252).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7565 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/attachments/diff.html.erb b/app/views/attachments/diff.html.erb
index 36e47217ba875761acba9fef0fd4597e682d12e1..96047926f9a2316ee6c8224487d3131f6b299267 100644 (file)
--- a/app/views/attachments/diff.html.erb
+++ b/app/views/attachments/diff.html.erb
@@ -10,7 +10,7 @@
  
 <%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
 
-<% html_title h(@attachment.filename) %>
+<% html_title @attachment.filename %>
 
 <% content_for :header_tags do -%>
     <%= stylesheet_link_tag "scm" -%>

diff --git a/app/views/attachments/file.html.erb b/app/views/attachments/file.html.erb
index fde551f8bdc11bc1a0995e160e9f161edf673d23..47cb7b1f9ad66aa4b2e6316781a1e4cf2c69e346 100644 (file)
--- a/app/views/attachments/file.html.erb
+++ b/app/views/attachments/file.html.erb
@@ -10,7 +10,7 @@
  
 <%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
 
-<% html_title h(@attachment.filename) %>
+<% html_title @attachment.filename %>
 
 <% content_for :header_tags do -%>
     <%= stylesheet_link_tag "scm" -%>

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 833e7d33daa7c9ff9bb2e0e137369ad8a0441795..34ccba9d6f501117422e1af77ff599048a44fc20 100644 (file)
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -65,7 +65,7 @@
   <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
 <% end %>
 
-<% html_title h(@board.name) %>
+<% html_title @board.name %>
 
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>

diff --git a/app/views/common/error.html.erb b/app/views/common/error.html.erb
index cbded214f2eb58356e17310109a1b1e2098f7dfd..0367b47beb24431adaecc4808b078310eac9ccad 100644 (file)
--- a/app/views/common/error.html.erb
+++ b/app/views/common/error.html.erb
@@ -3,4 +3,4 @@
 <p id="errorExplanation"><%=h @message %></p>
 <p><a href="javascript:history.back()">Back</a></p>
 
-<% html_title h(@status) %>
+<% html_title @status %>

diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb
index 922fe36bfe8c747e27e807a6e22ec6cbef191637..75854357e9d5c73a9ba4935c99f07089893375e5 100644 (file)
--- a/app/views/documents/show.html.erb
+++ b/app/views/documents/show.html.erb
@@ -25,7 +25,7 @@
   <% end %>
 <% end %>
 
-<% html_title h(@document.title) -%>
+<% html_title @document.title -%>
 
 <% content_for :header_tags do %>
     <%= stylesheet_link_tag 'scm' %>

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 87925e51943fb32940ebe9a330c7c6095135fc23..4c2caa7ffae5405bbc6a2938693696b5342ae1ef 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -6,7 +6,7 @@
 </div>
 
 <h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
-<% html_title(@query.new_record? ? l(:label_issue_plural) : h(@query.name)) %>
+<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
 
 <% form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %>
     <%= hidden_field_tag 'set_filter', '1' %>

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 1a7459347e460ac117e71978bfb6278504a513b3..491966b2224df578b44d3d8410f7edb5f4cbe5e0 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -113,7 +113,7 @@
   <%= f.link_to 'PDF' %>
 <% end %>
 
-<% html_title h("#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}") %>
+<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
 
 <% content_for :sidebar do %>
   <%= render :partial => 'issues/sidebar' %>

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index a7e0152f3a448e4ea060d6e62eae1f90babedcf5..c78856f73ecadfef3a05eca0ee9f3c230cfdbbf7 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -63,4 +63,4 @@
   <%= stylesheet_link_tag 'scm' %>
 <% end %>
 
-<% html_title h(@topic.subject) %>
+<% html_title @topic.subject %>

diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb
index e6405b920d84ca9e8f019636b538175326779996..aaf6f1af91dc39b05252d740367adf7ff1b08fc0 100644 (file)
--- a/app/views/news/show.html.erb
+++ b/app/views/news/show.html.erb
@@ -63,7 +63,7 @@
 <% end %>
 <% end %>
 
-<% html_title h(@news.title) -%>
+<% html_title @news.title -%>
 
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag 'scm' %>

diff --git a/app/views/repositories/_breadcrumbs.html.erb b/app/views/repositories/_breadcrumbs.html.erb
index de3001e036f2c603444e28a47e0ff0476125394b..0d548176c0d5bb24fae0195f33a96982d0e89262 100644 (file)
--- a/app/views/repositories/_breadcrumbs.html.erb
+++ b/app/views/repositories/_breadcrumbs.html.erb
@@ -25,4 +25,4 @@ dirs.each do |dir|
 %>
 <%= "@ #{h rev_text}" unless rev_text.blank? %>
 
-<% html_title(h(with_leading_slash(path))) -%>
+<% html_title(with_leading_slash(path)) -%>

diff --git a/app/views/repositories/diff.html.erb b/app/views/repositories/diff.html.erb
index 268aba2f44be99c4d62965a3479e5108788360ac..c3243017f48192d1dd3bbfd5ba0aa169860da0e8 100644 (file)
--- a/app/views/repositories/diff.html.erb
+++ b/app/views/repositories/diff.html.erb
@@ -16,7 +16,7 @@
   <%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
 <% end %>
 
-<% html_title(h(with_leading_slash(@path)), 'Diff') -%>
+<% html_title(with_leading_slash(@path), 'Diff') -%>
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 8170563674e295646cb8b4563ddb55b1d00871be..0c5883e8b8390e792eea881728e7d1226dcd1ed3 100644 (file)
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -8,4 +8,4 @@
 
 <%= render_tabs user_settings_tabs %>
 
-<% html_title(l(:label_user), h(@user.login), l(:label_administration)) -%>
+<% html_title(l(:label_user), @user.login, l(:label_administration)) -%>

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 8c0aa61115b619b4f7c873b21a881d29297c2a23..4ff40aa1c69d23ccdc1fc49e3f8bf9e0b466aa87 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -67,4 +67,4 @@
 <%= call_hook :view_account_right_bottom, :user => @user %>
 </div>
 
-<% html_title h(@user.name) %>
+<% html_title @user.name %>

diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb
index 1cd4f7de4d9f5edd14b8fb101d812727f9a79923..52a4bed1790b7e30007e05a710edc64525ab574a 100644 (file)
--- a/app/views/versions/show.html.erb
+++ b/app/views/versions/show.html.erb
@@ -53,4 +53,4 @@
 
 <%= call_hook :view_versions_show_bottom, :version => @version %>
 
-<% html_title h(@version.name) %>
+<% html_title @version.name %>

diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb
index 38dd5f5d6fd8c832c25cca13dbd5ebb685f35cb8..ae04a1a51f47f0a415b196e105533c1a80331da9 100644 (file)
--- a/app/views/wiki/edit.html.erb
+++ b/app/views/wiki/edit.html.erb
@@ -28,4 +28,4 @@
   <%= robot_exclusion_tag %>
 <% end %>
 
-<% html_title h(@page.pretty_title) %>
+<% html_title @page.pretty_title %>

diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index edf0a9f1c5a002176b11328d606c7e4e6377e17b..ef17112f1ecdd5084250f89a043e374395767339 100644 (file)
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -65,4 +65,4 @@
   <%= render :partial => 'sidebar' %>
 <% end %>
 
-<% html_title h(@page.pretty_title) %>
+<% html_title @page.pretty_title %>