Merge pull request #124 from mbreit/bugfix/707-wiki-diff-encoding-error-ruby19

[#707] Fix encoding error on wiki diffs on Ruby 1.9

Merge pull request #124 from mbreit/bugfix/707-wiki-diff-encoding-error-ruby19
[#707] Fix encoding error on wiki diffs on Ruby 1.9
8b7ee93f · Felix Schäfer · 03d956c3 · 60db8684 · 8b7ee93f
Commit 8b7ee93f authored Nov 25, 2011 by Felix Schäfer
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

wiki_content.rb app/models/wiki_content.rb +6 -1

No files found.
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -104,7 +104,12 @@ class WikiContent < ActiveRecord::Base
    def text
      @text ||= case changes["compression"]
      when "gzip"
-         Zlib::Inflate.inflate(changes["data"])
+        data = Zlib::Inflate.inflate(changes["data"])
+        if data.respond_to? :force_encoding
+          data.force_encoding("UTF-8")
+        else
+          data
+        end
      else
        # uncompressed data
        changes["data"]