From 67dd3afd929e3c0f639ccae366dff7367d22dafd Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Tue, 19 Jun 2012 15:33:47 +0200 Subject: [PATCH] Fix for 1.8 versions of ruby --- 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 599d1209..8a48f696 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.force_encoding('UTF-8'), - :message => v.message.force_encoding('UTF-8'), + :author => v.author.name.respond_to?(:force_encoding) ? v.author.name.force_encoding('UTF-8') : v.author.name, + :message => v.message.respond_to?(:force_encoding) ? v.message.force_encoding('UTF-8') : v.message, :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 829464e3..0b47df1c 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.force_encoding('UTF-8') + first.author.name.respond_to?(:force_encoding) ? first.author.name.force_encoding('UTF-8') : first.author.name end def date