diff options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/cgi_ext/multipart_progress.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/upload_progress_helper.rb | 2 |
2 files changed, 4 insertions, 2 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 diff --git a/actionpack/lib/action_view/helpers/upload_progress_helper.rb b/actionpack/lib/action_view/helpers/upload_progress_helper.rb index d9e3400a6e..35972ebbd7 100644 --- a/actionpack/lib/action_view/helpers/upload_progress_helper.rb +++ b/actionpack/lib/action_view/helpers/upload_progress_helper.rb @@ -170,7 +170,7 @@ module ActionView js_options = { :decay => options[:decay] || FREQUENCY_DECAY, - :freqency => options[:frequency] || FREQUENCY, + :frequency => options[:frequency] || FREQUENCY, } updater_options = '{' + js_options.map {|k, v| "#{k}:#{v}"}.sort.join(',') + '}' |