diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index 1bbdf09cb..1787a7898 100644 --- a/app/models/wiki_content.rb +++ b/app/models/wiki_content.rb @@ -91,14 +91,16 @@ class WikiContent < ActiveRecord::Base end def text - @text ||= case compression - when 'gzip' - str = Zlib::Inflate.inflate(data) + @text ||= begin + str = case compression + when 'gzip' + Zlib::Inflate.inflate(data) + else + # uncompressed data + data + end str.force_encoding("UTF-8") if str.respond_to?(:force_encoding) str - else - # uncompressed data - data end end