1 files changed, 14 insertions, 16 deletions

diff --git a/app/controllers/rss_controller.rb b/app/controllers/rss_controller.rb
index acffc0e..4b47218 100644
--- a/app/controllers/rss_controller.rb
+++ b/app/controllers/rss_controller.rb
@@ -1,19 +1,21 @@
 class RssController < ApplicationController
   
-  before_filter :authenticate, :only => :recent_changes
-  before_filter :get_host
+  before_action :authenticate, :only => :recent_changes
+  before_action :get_host
   
   def updates
     expires_in 31.minutes, :public => true
     
     I18n.locale = :de
-    
-    @items = Page.heads.find_tagged_with(
-      "update",
-      :order => "published_at DESC",
-      :limit => 20
-    )
-    
+  
+    @items = Page.heads
+      .joins("JOIN taggings ON taggings.taggable_id = pages.id
+            AND taggings.taggable_type = 'Page'
+            AND taggings.context = 'tags'")
+      .joins("JOIN tags ON tags.id = taggings.tag_id")
+      .where("LOWER(tags.name) = ?", "update")
+      .order("published_at DESC").limit(20)
+
     respond_to do |format|
       format.xml {}
       format.rdf {}
@@ -21,13 +23,9 @@ class RssController < ApplicationController
   end
 
   def recent_changes
-    @items = Page.all(
-      :limit => 20,
-      :order => "updated_at desc",
-      :conditions => [ 
-        "updated_at < ? AND updated_at > ?", Time.now, Time.now-14.days
-      ]
-    )
+    @items = Page.where(
+      "updated_at < ? AND updated_at > ?", Time.now, Time.now - 14.days
+    ).limit(20).order("updated_at desc")
   end
   
   protected