diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-09-20 17:46:59 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-09-20 17:46:59 +0000 |
| commit | 5e5b87b412e310fac4980fa5dc0ed7f0e58771cd (patch) | |
| tree | 36535f563fe6954b1a59171ba00df60ed7becbbb /actionpack | |
| parent | 4ae3db83663ad2f12d732da333c664a6452df674 (diff) | |
| download | rails-5e5b87b412e310fac4980fa5dc0ed7f0e58771cd.tar.gz rails-5e5b87b412e310fac4980fa5dc0ed7f0e58771cd.tar.bz2 rails-5e5b87b412e310fac4980fa5dc0ed7f0e58771cd.zip | |
Update CGI process to allow sessions to contain namespaced models. Closes #4638.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5152 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index eb4c5f4088..54fc1e72b8 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update CGI process to allow sessions to contain namespaced models. Closes #4638. [dfelstead@site5.com] + * Fix routing to respect user provided requirements and defaults when assigning default routing options (such as :action => 'index'). Closes #5950. [Nicholas Seckar] * Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability. #3368, #6226 [sdsykes, fhanshaw@vesaria.com] diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 5a08171ef2..50cf93defe 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -141,7 +141,7 @@ module ActionController #:nodoc: def stale_session_check! yield rescue ArgumentError => argument_error - if argument_error.message =~ %r{undefined class/module (\w+)} + if argument_error.message =~ %r{undefined class/module ([\w:]+)} begin Module.const_missing($1) rescue LoadError, NameError => const_error |