jro_apps/redmine Commit - r8865:30282f20daec

Fixed escaping issues in #textilizable with Rails 3.1....

Jean-Philippe Lang -

r8865:30282f20daec

parent child

Context file:

r8865:30282f20daec

Collapse all files

app/helpers/application_helper.rb +10 -9

               def principals_options_for_select(collection, selected=nil)
                 s = ''
                 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
                 groups = ''
                 collection.sort.each do |element|
                 while tag = tags.pop
                   parsed << "</#{tag}>"
                 end
-                parsed.html_safe
+                parsed
               end
               def parse_inline_attachments(text, project, obj, attr, only_path, options)
                       if !desc.blank? && alttext.blank?
                         alt = " title=\"#{desc}\" alt=\"#{desc}\""
                       end
-                      "src=\"#{image_url}\"#{alt}".html_safe
+                      "src=\"#{image_url}\"#{alt}"
                     else
-                      m.html_safe
                     end
                   end
                 end
                       link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
-                      all.html_safe
+                      all
                     end
                   else
-                    all.html_safe
+                    all
                   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
               def parse_sections(text, project, obj, attr, only_path, options)
                 return unless options[:edit_section_links]
                 text.gsub!(HEADING_RE) do
+                  heading = $1
                   @current_section += 1
                   if @current_section > 1
                     content_tag('div',
                       link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => @current_section)),
                       :class => 'contextual',
-                      :title => l(:button_edit_section)) + $1
+                      :title => l(:button_edit_section)) + heading.html_safe
                   else
-                    $1
+                    heading
                   end
                 end
               end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages