deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2009-04-13 19:09:30 -05:00
parent 83e9415c67 f062dfe15a
commit 8222c14396
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -136,9 +136,6 @@ class ApplicationController < ActionController::Base
end end
def rescue_action_in_public(exception) def rescue_action_in_public(exception)
if exception.instance_of?(ActiveController::Session::CookieStore::TamperedWithCookie)
render :text => 'Stale session. Please reload the page.', :status =>500, :layout => 'error'
else
render :status => 500, :text => <<-EOL render :status => 500, :text => <<-EOL
<html xmlns="http://www.w3.org/1999/xhtml"><body> <html xmlns="http://www.w3.org/1999/xhtml"><body>
<h2>Internal Error</h2> <h2>Internal Error</h2>
@ -146,7 +143,6 @@ class ApplicationController < ActionController::Base
<!-- \n#{exception.to_s.is_utf8? ? exception.to_s.gsub!(/-{2,}/, '- -') : ''}\n#{exception.backtrace.join("\n")}\n --> <!-- \n#{exception.to_s.is_utf8? ? exception.to_s.gsub!(/-{2,}/, '- -') : ''}\n#{exception.backtrace.join("\n")}\n -->
</body></html> </body></html>
EOL EOL
end
end end
def return_to_last_remembered def return_to_last_remembered