aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-01 08:31:30 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-01 08:31:30 +0000
commit5651a69130acfcfadcf0d0eeafe7e7f5ee5ba17b (patch)
treec04655054e576604f458bc4a381ba59eabb679c5 /actionpack/lib/action_controller
parentcadcd9e7144394ecc9df01961191d20e5e219a37 (diff)
downloadrails-5651a69130acfcfadcf0d0eeafe7e7f5ee5ba17b.tar.gz
rails-5651a69130acfcfadcf0d0eeafe7e7f5ee5ba17b.tar.bz2
rails-5651a69130acfcfadcf0d0eeafe7e7f5ee5ba17b.zip
Load models and frequency typo on upoad progress #1555 [Sean Treadway]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1580 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/cgi_ext/multipart_progress.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/multipart_progress.rb b/actionpack/lib/action_controller/cgi_ext/multipart_progress.rb
index d297c6f86e..07961a03d2 100644
--- a/actionpack/lib/action_controller/cgi_ext/multipart_progress.rb
+++ b/actionpack/lib/action_controller/cgi_ext/multipart_progress.rb
@@ -125,7 +125,9 @@ class CGI #:nodoc:
options = options.stringify_keys
- #Controllers.const_load!(:ApplicationController, "application") unless Controllers.const_defined?(:ApplicationController)
+ # Pull in the application controller to satisfy any dependencies on class definitions
+ # of instances stored in the session.
+ Controllers.const_load!(:ApplicationController, "application") unless Controllers.const_defined?(:ApplicationController)
# Assumes that @cookies has already been setup
# Raises nomethod if upload_id is not defined