Merge remote-tracking branch 'origin/master'

Weblate
2 parents 5af9bfdf 5f13eb30
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
lib/acts_as_having_posts.rb
@@ -22,7 +22,7 @@ module ActsAsHavingPosts
   end
  
   def feed
-    Article.where(:parent_id => self.id).where(:type => 'RssFeed').first
+    children.where(:type => 'RssFeed').first
   end
  
   def feed=(attrs)
...	...	@@ -22,7 +22,7 @@ module ActsAsHavingPosts
22	22	end
23	23
24	24	def feed
25		- Article.where(:parent_id => self.id).where(:type => 'RssFeed').first
	25	+ children.where(:type => 'RssFeed').first
26	26	end
27	27
28	28	def feed=(attrs)
...	...