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

Changeset 7002

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

Fix syntax error in dispatcher than wrecked failsafe responses. Closes #8625.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/railties/CHANGELOG

    r6994 r7002  
    11*SVN* 
     2 
     3* Fix syntax error in dispatcher than wrecked failsafe responses.  #8625 [mtitorenko] 
    24 
    35* Scaffolded validation errors set the appropriate HTTP status for XML responses.  #6946, #8622 [Manfred Stienstra, mmmultiworks] 
  • trunk/railties/lib/dispatcher.rb

    r6611 r7002  
    4141    rescue Exception => exception  # errors from CGI dispatch 
    4242      failsafe_response(cgi, output, '500 Internal Server Error', exception) do 
    43         controller ||= ApplicationController rescue LoadError nil 
    44         controller ||= ActionController::Base 
     43        controller ||= ApplicationController rescue ActionController::Base 
    4544        controller.process_with_exception(request, response, exception).out(output) 
    4645      end