Merge remote-tracking branch 'openstreetmap/pull/954'

[rails.git] / config / initializers / streaming.rb

diff --git a/config/initializers/streaming.rb b/config/initializers/streaming.rb
index db61e6b24041069f478d5ef09a5b5f2076155ab3..0c27ba2e79e1f489cebbf2c4b9fbddc33b5b3328 100644 (file)
--- a/config/initializers/streaming.rb
+++ b/config/initializers/streaming.rb
@@ -1,10 +1,10 @@
 # Hack ActionController::DataStreaming to allow streaming from a file handle
 module ActionController
   module DataStreaming
-    alias_method :old_send_file, :send_file
+    alias old_send_file send_file
 
     def send_file(file, options = {})
-      if file.is_a? File or file.is_a? Tempfile
+      if file.is_a?(File) || file.is_a?(Tempfile)
         headers["Content-Length"] ||= file.size.to_s
 
         options[:filename] ||= File.basename(file.path) unless options[:url_based_filename]