mirror of
https://github.com/github/rails.git
synced 2026-04-04 03:00:58 -04:00
Retract the session fix until 0.13.1 to preserve the truthfulness of the book
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1730 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -95,22 +95,29 @@ module ActionController #:nodoc:
|
||||
@session["__valid_session"]
|
||||
return @session
|
||||
rescue ArgumentError => e
|
||||
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
|
||||
# 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}])"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user