Updates and RSS generation done

[feedcatcher.git] / app / models / feed_item.rb

diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index ce5b8c6c05e674dd46de604e79797cfdad41d305..cf01358f8ee2b01e5361b4d664ceeb1ea760199c 100644 (file)
--- a/app/models/feed_item.rb
+++ b/app/models/feed_item.rb
@@ -1,6 +1,6 @@
 class FeedItem < ActiveRecord::Base
 
-  require 'cgi' # needed for url decoding
+  # require 'cgi' # needed for url decoding
 
   validates_presence_of :feed_name, :title, :description
   validate :feed_name_must_be_legal
@@ -8,8 +8,8 @@ class FeedItem < ActiveRecord::Base
 protected
 
   def feed_name_must_be_legal
-    if url_encode(feed_name) != feed_name or
-        CGI::unescape(feed_name) != feed_name or
+    if Rack::Utils::escape(feed_name) != feed_name or
+        Rack::Utils::unescape(feed_name) != feed_name or
         feed_name == 'index' or
         feed_name == 'show' or
         feed_name == 'update' or