Merge remote-tracking branch 'upstream/pull/2441'

[rails.git] / app / models / message.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index 2447c3b7940821da7380764bbdc70801484dd057..4ab129e9184f6593012bacd98c3de504ca06662c 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -24,15 +24,13 @@
 #  messages_to_user_id_fkey    (to_user_id => users.id)
 #
 
 #  messages_to_user_id_fkey    (to_user_id => users.id)
 #
 

-require "validators"
-

 class Message < ActiveRecord::Base
   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 
   validates :title, :presence => true, :utf8 => true, :length => 1..255
   validates :body, :sent_on, :sender, :recipient, :presence => true
 class Message < ActiveRecord::Base
   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 
   validates :title, :presence => true, :utf8 => true, :length => 1..255
   validates :body, :sent_on, :sender, :recipient, :presence => true

-  validates :title, :body, :invalid_chars => true
+  validates :title, :body, :characters => true

 
   def self.from_mail(mail, from, to)
     if mail.multipart?
 
   def self.from_mail(mail, from, to)
     if mail.multipart?