Merge branch 'develop' into wdtk

1 files changed, 4 insertions, 7 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index a41d6d2db..4c8181faa 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -136,7 +136,7 @@ class InfoRequest < ActiveRecord::Base
             else
                 fake_slug = external_user_name.parameterize
             end
-            public_body.url_name + "_"+fake_slug
+            (public_body.url_name || "") + "_" + fake_slug
         else
             user.url_name
         end
@@ -997,14 +997,11 @@ public
 
     # Call groups of censor rules
     def apply_censor_rules_to_text!(text)
-        for censor_rule in self.censor_rules
-            censor_rule.apply_to_text!(text)
-        end
-        if self.user # requests during construction have no user
-            for censor_rule in self.user.censor_rules
+        [self.censor_rules, self.user.try(:censor_rules),
+            CensorRule.regexps.all].flatten.compact.each do |censor_rule|
                 censor_rule.apply_to_text!(text)
             end
-        end
+        return text
     end
 
     def apply_censor_rules_to_binary!(binary)