jro_apps/redmine Commit - r1956:0f1787ea0dfa

Fixed: Inline images don't work if file name has upper case letters or if image is in BMP format (#2102)....

Jean-Philippe Lang -

r1956:0f1787ea0dfa

parent child

Context file:

r1956:0f1787ea0dfa

app/helpers/application_helper.rb +1 -1

                 if attachments
                   attachments = attachments.sort_by(&:created_on).reverse
-                  text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
+                  text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(bmp|gif|jpg|jpeg|png))!/i) do |m|
                     style = $1
                     filename = $6
                     rf = Regexp.new(Regexp.escape(filename),  Regexp::IGNORECASE)

test/unit/helpers/application_helper_test.rb +11 -1

                                   :repositories, :changesets,
                                   :trackers, :issue_statuses, :issues, :versions, :documents,
                                   :wikis, :wiki_pages, :wiki_contents,
-                                  :boards, :messages
+                                  :boards, :messages,
+                                  :attachments
               def setup
                 super
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
+              def test_attached_images
+                to_test = {
+                  'Inline image: !logo.gif!' => 'Inline image: <img src="/attachments/download/3" title="This is a logo" alt="This is a logo" />',
+                  'Inline image: !logo.GIF!' => 'Inline image: <img src="/attachments/download/3" title="This is a logo" alt="This is a logo" />'
+                }
+                attachments = Attachment.find(:all)
+                to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text, :attachments => attachments) }
+              end
               def test_textile_external_links
                 to_test = {
                   'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',

General Comments 0

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

No TODOs yet

	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