Merge branch 'version-dependent-caching' into rails-3-develop

2 files changed, 12 insertions, 2 deletions

diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 635ba8f58..0ee82d30c 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -278,9 +278,15 @@ class InfoRequestEvent < ActiveRecord::Base
         end
         self.params_yaml = params.to_yaml
     end
+
     def params
-        YAML.load(self.params_yaml)
+        param_hash = YAML.load(params_yaml)
+        param_hash.each do |key, value|
+            param_hash[key] = value.force_encoding('UTF-8') if value.respond_to?(:force_encoding)
+        end
+        param_hash
     end
+
     def params_yaml_as_html
         ret = ''
         # split out parameters into old/new diffs, and other ones
diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb
index 8049349d0..59160381c 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -71,7 +71,11 @@ class PostRedirect < ActiveRecord::Base
     end
 
     def reason_params
-        YAML.load(reason_params_yaml)
+        param_hash = YAML.load(reason_params_yaml)
+        param_hash.each do |key, value|
+            param_hash[key] = value.force_encoding('UTF-8') if value.respond_to?(:force_encoding)
+        end
+        param_hash
     end
 
     # Extract just local path part, without domain or #