aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
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