aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-02 11:29:41 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-02 11:29:41 +0000
commiteb2b86d795817ad342be7d2a19e9f5cc7390ab2d (patch)
tree3947dcd74533c81a1ae7af1056e525faa00684dc /actionpack/lib/action_controller/base.rb
parent50f0a736242e65408c06b62b0fbd68e2ea349c23 (diff)
downloadrails-eb2b86d795817ad342be7d2a19e9f5cc7390ab2d.tar.gz
rails-eb2b86d795817ad342be7d2a19e9f5cc7390ab2d.tar.bz2
rails-eb2b86d795817ad342be7d2a19e9f5cc7390ab2d.zip
Added ActionController::Base.enable_upload_progress for people who want to play with the experimental upload progress
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1607 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rwxr-xr-xactionpack/lib/action_controller/base.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 91ebc7e69d..c9b0973561 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -325,6 +325,12 @@ module ActionController #:nodoc:
path_of_controller_root = path_of_calling_controller.sub(/#{controller_path.split("/")[0..-2]}$/, "")
self.template_root = path_of_controller_root
end
+
+ # Temporary method for enabling upload progress until it's ready to leave experimental mode
+ def enable_upload_progress # :nodoc:
+ require 'action_controller/upload_progress'
+ include ActionController::UploadProgress
+ end
end
public