Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 7003

Show
Ignore:
Timestamp:
06/11/07 18:06:29 (1 year ago)
Author:
bitsweat
Message:

Merge [7002] to stable: fix syntax error in dispatcher than wrecked failsafe responses. References #8625.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1-2-stable/railties/CHANGELOG

    r6872 r7003  
    11*SVN* 
     2 
     3* Fix syntax error in dispatcher than wrecked failsafe responses.  #8625 [mtitorenko] 
    24 
    35* Add Active Resource to rails:freeze:edge and drop Action Web Service.  #8205 [underbluewaters, Jeremy Kemper] 
  • branches/1-2-stable/railties/lib/dispatcher.rb

    r5658 r7003  
    4343    rescue Exception => exception  # errors from CGI dispatch 
    4444      failsafe_response(output, '500 Internal Server Error', exception) do 
    45         controller ||= ApplicationController rescue LoadError nil 
    46         controller ||= ActionController::Base 
     45        controller ||= ApplicationController rescue ActionController::Base 
    4746        controller.process_with_exception(request, response, exception).out(output) 
    4847      end