diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index 688d1d27a..70dacc75a 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -24,7 +24,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
xml.email(author.mail) if author.is_a?(User) && !author.mail.blank? && !author.pref.hide_mail
end if author
xml.content "type" => "html" do
- xml.text! textilizable(item.event_description, :only_path => false)
+ xml.text! textilizable(item, :event_description, :only_path => false)
end
end
end
diff --git a/app/views/issues/changes.rxml b/app/views/issues/changes.rxml
index 43324cfb8..4c1e678bf 100644
--- a/app/views/issues/changes.rxml
+++ b/app/views/issues/changes.rxml
@@ -23,7 +23,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
xml.text! '
' + show_detail(detail, false) + ''
end
xml.text! ''
- xml.text! textilizable(change.notes) unless change.notes.blank?
+ xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank?
end
end
end
diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml
index 2497bd9a3..94c118f9e 100644
--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -109,4 +109,16 @@ attachments_009:
filename: version_file.zip
author_id: 2
content_type: application/octet-stream
+attachments_010:
+ created_on: 2006-07-19 21:07:27 +02:00
+ container_type: Issue
+ container_id: 2
+ downloads: 0
+ disk_filename: 060719210727_picture.jpg
+ digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+ id: 10
+ filesize: 452
+ filename: picture.jpg
+ author_id: 2
+ content_type: image/jpeg
\ No newline at end of file
diff --git a/test/fixtures/journals.yml b/test/fixtures/journals.yml
index 70aa5da73..3ee66ae6b 100644
--- a/test/fixtures/journals.yml
+++ b/test/fixtures/journals.yml
@@ -13,4 +13,11 @@ journals_002:
journalized_type: Issue
user_id: 2
journalized_id: 1
+journals_003:
+ created_on: <%= 1.days.ago.to_date.to_s(:db) %>
+ notes: "A comment with inline image: !picture.jpg!"
+ id: 3
+ journalized_type: Issue
+ user_id: 2
+ journalized_id: 2
\ No newline at end of file
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index ff132669d..4b5c2d343 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -369,6 +369,14 @@ class IssuesControllerTest < Test::Unit::TestCase
:descendant => { :tag => 'a', :content => /#4$/ }
end
+ def test_show_atom
+ get :show, :id => 2, :format => 'atom'
+ assert_response :success
+ assert_template 'changes.rxml'
+ # Inline image
+ assert @response.body.include?("<img src=\"http://test.host/attachments/download/10\" alt=\"\" />")
+ end
+
def test_new_routing
assert_routing(
{:method => :get, :path => '/projects/1/issues/new'},