diff --git a/app/views/wiki/rss_feed.rhtml b/app/views/wiki/rss_feed.rhtml
index 12ac7073..a33131a3 100644
--- a/app/views/wiki/rss_feed.rhtml
+++ b/app/views/wiki/rss_feed.rhtml
@@ -8,7 +8,7 @@
40
<% for page in @pages_by_revision %>
-
- <%= page.plain_name %>
+ <%= h page.plain_name %>
<% unless @hide_description %>
<%= h page.display_content %>
<% end %>
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 800c324a..1ca3f814 100755
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -462,6 +462,19 @@ class WikiControllerTest < Test::Unit::TestCase
pages = r.template_objects['pages_by_revision']
assert_equal 5, pages.size
end
+
+ def test_rss_title_with_ampersand
+ # was ticket:143
+ setup_wiki_with_three_pages
+
+ @wiki.write_page('wiki1', 'Title&With&Ampersands',
+ 'About spaces', 1.hour.ago, Author.new('NitPicker', '127.0.0.3'))
+
+ r = process 'rss_with_headlines', 'web' => 'wiki1'
+
+ assert r.body.include?('Home Page')
+ assert r.body.include?('Title&With&Ampersands')
+ end
def test_save
r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => 'Contents of a new page',