From: Etienne Massip Date: Sun, 2 Oct 2011 18:45:17 +0000 (+0000) Subject: Remove unecessary page title HTML escaping from views (#9252). X-Git-Tag: 1.3.0~414 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4ecd65c4658cddc3ebf0e975d93c975fcfdaf764;p=redmine.git 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 36e47217b..96047926f 100644 --- 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 fde551f8b..47cb7b1f9 100644 --- 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 833e7d33d..34ccba9d6 100644 --- 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 cbded214f..0367b47be 100644 --- a/app/views/common/error.html.erb +++ b/app/views/common/error.html.erb @@ -3,4 +3,4 @@

<%=h @message %>

Back

-<% html_title h(@status) %> +<% html_title @status %> diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb index 922fe36bf..75854357e 100644 --- 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 87925e519..4c2caa7ff 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -6,7 +6,7 @@

<%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %>

-<% 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 1a7459347..491966b22 100644 --- 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 a7e0152f3..c78856f73 100644 --- 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 e6405b920..aaf6f1af9 100644 --- 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 de3001e03..0d548176c 100644 --- 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 268aba2f4..c3243017f 100644 --- 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 817056367..0c5883e8b 100644 --- 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 8c0aa6111..4ff40aa1c 100644 --- 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 %> -<% 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 1cd4f7de4..52a4bed17 100644 --- 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 38dd5f5d6..ae04a1a51 100644 --- 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 edf0a9f1c..ef17112f1 100644 --- 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 %>