Merge branch 'release/0.6.3' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/request/show.rhtml
    spec/models/info_request_spec.rb

1 files changed, 14 insertions, 13 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 7e69a5cda..a7d09401b 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
@@ -995,27 +995,28 @@ public
         return ret.reverse
     end
 
+    # Get the list of censor rules that apply to this request
+    def applicable_censor_rules
+        applicable_rules = [self.censor_rules, self.public_body.censor_rules, CensorRule.global.all]
+        if self.user && !self.user.censor_rules.empty?
+            applicable_rules << self.user.censor_rules
+        end
+        return applicable_rules.flatten
+    end
+
     # Call groups of censor rules
     def apply_censor_rules_to_text!(text)
-        for censor_rule in self.censor_rules
+        self.applicable_censor_rules.each do |censor_rule|
             censor_rule.apply_to_text!(text)
         end
-        if self.user # requests during construction have no user
-            for censor_rule in self.user.censor_rules
-                censor_rule.apply_to_text!(text)
-            end
-        end
+        return text
     end
 
     def apply_censor_rules_to_binary!(binary)
-        for censor_rule in self.censor_rules
+        self.applicable_censor_rules.each do |censor_rule|
             censor_rule.apply_to_binary!(binary)
         end
-        if self.user # requests during construction have no user
-            for censor_rule in self.user.censor_rules
-                censor_rule.apply_to_binary!(binary)
-            end
-        end
+        return binary
     end
 
     def is_owning_user?(user)