Fixed escaping issues in #textilizable with Rails 3.1.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8985 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
7ad40e22fe
commit
30282f20da
|
@ -306,7 +306,7 @@ module ApplicationHelper
|
||||||
def principals_options_for_select(collection, selected=nil)
|
def principals_options_for_select(collection, selected=nil)
|
||||||
s = ''
|
s = ''
|
||||||
if collection.include?(User.current)
|
if collection.include?(User.current)
|
||||||
s << content_tag('option', "<< #{l(:label_me)} >>", :value => User.current.id)
|
s << content_tag('option', "<< #{l(:label_me)} >>".html_safe, :value => User.current.id)
|
||||||
end
|
end
|
||||||
groups = ''
|
groups = ''
|
||||||
collection.sort.each do |element|
|
collection.sort.each do |element|
|
||||||
|
@ -547,7 +547,7 @@ module ApplicationHelper
|
||||||
while tag = tags.pop
|
while tag = tags.pop
|
||||||
parsed << "</#{tag}>"
|
parsed << "</#{tag}>"
|
||||||
end
|
end
|
||||||
parsed.html_safe
|
parsed
|
||||||
end
|
end
|
||||||
|
|
||||||
def parse_inline_attachments(text, project, obj, attr, only_path, options)
|
def parse_inline_attachments(text, project, obj, attr, only_path, options)
|
||||||
|
@ -564,9 +564,9 @@ module ApplicationHelper
|
||||||
if !desc.blank? && alttext.blank?
|
if !desc.blank? && alttext.blank?
|
||||||
alt = " title=\"#{desc}\" alt=\"#{desc}\""
|
alt = " title=\"#{desc}\" alt=\"#{desc}\""
|
||||||
end
|
end
|
||||||
"src=\"#{image_url}\"#{alt}".html_safe
|
"src=\"#{image_url}\"#{alt}"
|
||||||
else
|
else
|
||||||
m.html_safe
|
m
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -618,10 +618,10 @@ module ApplicationHelper
|
||||||
link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
|
link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
|
||||||
else
|
else
|
||||||
# project or wiki doesn't exist
|
# project or wiki doesn't exist
|
||||||
all.html_safe
|
all
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
all.html_safe
|
all
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -786,7 +786,7 @@ module ApplicationHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
(leading + (link || "#{project_prefix}#{prefix}#{repo_prefix}#{sep}#{identifier}#{comment_suffix}")).html_safe
|
(leading + (link || "#{project_prefix}#{prefix}#{repo_prefix}#{sep}#{identifier}#{comment_suffix}"))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -795,14 +795,15 @@ module ApplicationHelper
|
||||||
def parse_sections(text, project, obj, attr, only_path, options)
|
def parse_sections(text, project, obj, attr, only_path, options)
|
||||||
return unless options[:edit_section_links]
|
return unless options[:edit_section_links]
|
||||||
text.gsub!(HEADING_RE) do
|
text.gsub!(HEADING_RE) do
|
||||||
|
heading = $1
|
||||||
@current_section += 1
|
@current_section += 1
|
||||||
if @current_section > 1
|
if @current_section > 1
|
||||||
content_tag('div',
|
content_tag('div',
|
||||||
link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => @current_section)),
|
link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => @current_section)),
|
||||||
:class => 'contextual',
|
:class => 'contextual',
|
||||||
:title => l(:button_edit_section)) + $1
|
:title => l(:button_edit_section)) + heading.html_safe
|
||||||
else
|
else
|
||||||
$1
|
heading
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue