diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/pages_controller.rb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a9a25f0..ee53415 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -47,7 +47,8 @@ class ApplicationController < ActionController::Base ## RENDERING ## - def render_500 + def render_500(msg=nil) + @message = msg render :template => 'errors/error', :status => 500 end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 3e76092..933aed7 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -5,6 +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 def show @page = site.find_pages(params[:page]) |