X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=app%2Fmodels%2Ffeed_item.rb;h=cf01358f8ee2b01e5361b4d664ceeb1ea760199c;hb=73ebfcfd8bdc389269ab4522a8cfc2486c32978e;hp=ce5b8c6c05e674dd46de604e79797cfdad41d305;hpb=a1e2591b5689c6d0f0b9c3a80edb2c211b549f33;p=feedcatcher.git

diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index ce5b8c6..cf01358 100644
--- 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