aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/models/outgoing_message.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index e934e561a..86c11a1d5 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -21,7 +21,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: outgoing_message.rb,v 1.68 2008-10-28 08:41:04 francis Exp $
+# $Id: outgoing_message.rb,v 1.69 2008-10-28 09:15:57 francis Exp $
class OutgoingMessage < ActiveRecord::Base
belongs_to :info_request
@@ -72,8 +72,10 @@ class OutgoingMessage < ActiveRecord::Base
ret = ret.gsub(/(?:\n\s*){2,}/, "\n\n") # remove excess linebreaks that unnecessarily space it out
# Remove things from censor rules
- for censor_rule in self.info_request.censor_rules
- ret = censor_rule.apply_to_text(ret)
+ if !self.info_request.nil?
+ for censor_rule in self.info_request.censor_rules
+ ret = censor_rule.apply_to_text(ret)
+ end
end
ret