Merged updates into stable branch

[feedcatcher.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 1240ec454b96f800e8a3dcfff658bd9159767a21..75eb181d1231adf4e45cdfed1e927f47412d52f4 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -38,12 +38,16 @@ ActionController::Routing::Routes.draw do |map|
     :conditions => { :method => :get },
     :controller => 'feed',
     :action => 'show'
-  map.update ':ignored',
+  map.update '*ignored',
     :conditions => { :method => :post },
-    :defaults => { :ignored => nil },
+    #:defaults => { :ignored => nil },
     :controller => 'feed',
     :action => 'update'
 
+  map.connect '*ignored',
+    :controller => 'feed',
+    :action => 'index'
+
   # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
   map.root :controller => "feed"