Merge branch 'next' into stable

Leandro Santos
2 parents c11cfb6d 82193169
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
app/models/comment.rb
@@ -46,6 +46,8 @@ class Comment &lt; ActiveRecord::Base
  
   acts_as_having_settings :field => :setting
  
+  acts_as_having_settings
+
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
  
   def comment_root
...	...	@@ -46,6 +46,8 @@ class Comment < ActiveRecord::Base
46	46
47	47	acts_as_having_settings :field => :setting
48	48
	49	+ acts_as_having_settings
	50	+
49	51	xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
50	52
51	53	def comment_root
...	...