temporarily disable i18n fix until ruby 1.9 is running.
authorelijah <elijah@riseup.net>
Tue, 29 Oct 2013 01:53:09 +0000 (18:53 -0700)
committerelijah <elijah@riseup.net>
Tue, 29 Oct 2013 01:53:09 +0000 (18:53 -0700)
app/controllers/pages_controller.rb
lib/static_page.rb

index 933aed7..ab239c8 100644 (file)
@@ -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])
index 9f4cc05..be64363 100644 (file)
@@ -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