Merged updates from trunk into stable branch

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

diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index 6dac7bca5d29a6eab048eeaf331ebc21b5750f45..f18374f42fa66027a85e18eafd37c34a8db551dc 100644 (file)
--- a/app/models/feed_item.rb
+++ b/app/models/feed_item.rb
@@ -3,6 +3,7 @@ class FeedItem < ActiveRecord::Base
   # require 'cgi' # needed for url decoding
 
   validates_presence_of :feed_name, :title, :description
+  validates_uniqueness_of :title, :scope => :feed_name
   validate :feed_name_must_be_legal
 
   def FeedItem.valid_feed_name?(feed_name)