diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 39 |
2 files changed, 21 insertions, 23 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 4e6ebdb5be..37577f03b8 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Fixed that a SessionRestoreError was thrown if a model object was placed in the session that wasn't available to all controllers. This means that it's no longer necessary to use the 'model :post' work-around in ApplicationController to have a Post model in your session. + + *1.9.0* (6 July, 2005) * Added logging of the request URI in the benchmark statement (makes it easy to grep for slow actions) diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index bb34751f64..a8ac127ac7 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -95,29 +95,22 @@ module ActionController #:nodoc: @session["__valid_session"] return @session rescue ArgumentError => e - # TODO: Uncomment this on 0.13.1 - # if e.message =~ %r{undefined class/module (\w+)} - # begin - # Module.const_missing($1) - # rescue LoadError, NameError => e - # raise( - # ActionController::SessionRestoreError, - # "Session contained objects where the class definition wasn't available. " + - # "Remember to require classes for all objects kept in the session. " + - # "(Original exception: #{e.message} [#{e.class}])" - # ) - # end - # - # retry - # else - # raise - # end - raise( - ActionController::SessionRestoreError, - "Session contained objects where the class definition wasn't available. " + - "Remember to require classes for all objects kept in the session. " + - "(Original exception: #{e.message} [#{e.class}])" - ) + if e.message =~ %r{undefined class/module (\w+)} + begin + Module.const_missing($1) + rescue LoadError, NameError => e + raise( + ActionController::SessionRestoreError, + "Session contained objects where the class definition wasn't available. " + + "Remember to require classes for all objects kept in the session. " + + "(Original exception: #{e.message} [#{e.class}])" + ) + end + + retry + else + raise + end end end |