From c704d1f3b3aebb4b7086e45f2fd41398a097bbb0 Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Mon, 18 Jun 2012 09:44:20 +0200 Subject: [PATCH] Hacky fix for encoding issues --- lib/gollum/frontend/views/history.rb | 4 ++-- lib/gollum/frontend/views/page.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gollum/frontend/views/history.rb b/lib/gollum/frontend/views/history.rb index d3cb143f..599d1209 100644 --- a/lib/gollum/frontend/views/history.rb +++ b/lib/gollum/frontend/views/history.rb @@ -15,8 +15,8 @@ module Precious :id7 => v.id[0..6], :num => i, :selected => @page.version.id == v.id, - :author => v.author.name, - :message => v.message, + :author => v.author.name.force_encoding('UTF-8'), + :message => v.message.force_encoding('UTF-8'), :date => v.committed_date.strftime("%B %d, %Y"), :gravatar => Digest::MD5.hexdigest(v.author.email) } end diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb index 89eab7e7..829464e3 100644 --- a/lib/gollum/frontend/views/page.rb +++ b/lib/gollum/frontend/views/page.rb @@ -17,7 +17,7 @@ module Precious page_versions = @page.versions first = page_versions ? page_versions.first : false return DEFAULT_AUTHOR unless first - first.author.name + first.author.name.force_encoding('UTF-8') end def date