diff options
| author | elijah <elijah@riseup.net> | 2013-10-28 18:53:09 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-10-28 18:53:09 -0700 |
| commit | ac7c35a84a6cc88807ab582517c731b1fb21aee6 (patch) | |
| tree | 1f636e2fb69de625990846b24cdfd1e1230d43fa | |
| parent | 588459b069b7648e91a1c665e115a07fdef98fad (diff) | |
temporarily disable i18n fix until ruby 1.9 is running.
| -rw-r--r-- | app/controllers/pages_controller.rb | 6 | ||||
| -rw-r--r-- | lib/static_page.rb | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 933aed7..ab239c8 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -5,9 +5,9 @@ class PagesController < ApplicationController layout :choose_layout rescue_from ActionView::MissingTemplate, :with => :render_404 rescue_from PageNotFound, :with => :render_404 - rescue_from Encoding::CompatibilityError do |exception| - render_500(exception.to_s) - end + #rescue_from Encoding::CompatibilityError do |exception| + # render_500(exception.to_s) + #end def show @page = site.find_pages(params[:page]) diff --git a/lib/static_page.rb b/lib/static_page.rb index 9f4cc05..be64363 100644 --- a/lib/static_page.rb +++ b/lib/static_page.rb @@ -411,7 +411,8 @@ class StaticPage rd = RDiscount.new(string, :smart, :generate_toc, :autolink) html = rd.to_html if props.locale(locale).toc != false && rd.toc_content - html = "<div id=\"TOC\">%s</div>\n\n%s" % [rd.toc_content.force_encoding('utf-8'), html] + #html = "<div id=\"TOC\">%s</div>\n\n%s" % [rd.toc_content.force_encoding('utf-8'), html] + html = "<div id=\"TOC\">%s</div>\n\n%s" % [rd.toc_content, html] end unless (title = explicit_title(locale)).nil? html = "<h1 class=\"first\">#{title}</h1>\n\n" + html |