0
@@ -68,7 +68,8 @@ class Comment < Content
0
 
0
   protected
0
     def snag_article_attributes
0
-      self.attributes = { :site => article.site, :filter => article.site.filter, :title => article.title, :published_at => article.published_at, :permalink => article.permalink }
0
+      self.filter ||= article.site.filter
0
+      self.attributes = { :site => article.site, :title => article.title, :published_at => article.published_at, :permalink => article.permalink }
0
     end
0
 
0
     def check_comment_expiration

0
@@ -18,14 +18,22 @@ class CommentTest < Test::Unit::TestCase
0
     end
0
   end
0
 
0
-  def test_should_pass_filter_down_from_article
0
+  def test_should_pass_filter_down_from_article_site
0
     old_times = contents(:welcome).comments.collect &:updated_at
0
-    comment = contents(:welcome).comments.create :body => 'test comment', :author => 'bob', :author_ip => '127.0.0.1', :filter => 'textile_filter'
0
+    comment = contents(:welcome).comments.create :body => 'test comment', :author => 'bob', :author_ip => '127.0.0.1'
0
     assert_equal 'textile_filter', comment.filter
0
     assert_valid comment
0
     assert_equal old_times, contents(:welcome).comments(true).collect(&:updated_at)
0
   end
0
 
0
+  def test_should_allow_set_filter_on_comment
0
+    old_times = contents(:welcome).comments.collect &:updated_at
0
+    comment = contents(:welcome).comments.create :body => 'test comment', :author => 'bob', :author_ip => '127.0.0.1', :filter => 'markdown_filter'
0
+    assert_equal 'markdown_filter', comment.filter
0
+    assert_valid comment
0
+    assert_equal old_times, contents(:welcome).comments(true).collect(&:updated_at)
0
+  end
0
+
0
   def test_should_process_textile_when_adding_comment
0
     c = contents(:welcome).comments.create :body => '*test* comment', :author => 'bob', :author_ip => '127.0.0.1'
0
     assert_equal "<p><strong>test</strong> comment</p>", c.body_html