kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
WikiDiff#to_html returns a string with ASCII encoding if
the WikiJournal content has been Zlib compressed because
Zlib::Inflate.inflate returns strings with ASCII encoding.
Forcing the encoding to be UTF8 fixes this bug.
This commit is contained in:
Moritz Breit 2011-11-16 16:21:04 +01:00
parent 0462fa973b
commit 60db868470
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/wiki_content.rb
View File

@ -104,7 +104,12 @@ class WikiContent < ActiveRecord::Base
def text def text
@text ||= case changes["compression"] @text ||= case changes["compression"]
when "gzip" 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 else
# uncompressed data # uncompressed data
changes["data"] changes["data"]