From 55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 17 Jun 2009 16:23:11 -0700
Subject: Cleaning up if defined?(ActionController::Http) blocks from the pre
 new base era.

---
 actionpack/lib/action_controller/base/streaming.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'actionpack/lib/action_controller/base/streaming.rb')

diff --git a/actionpack/lib/action_controller/base/streaming.rb b/actionpack/lib/action_controller/base/streaming.rb
index 5c72fc9ad9..70a97ccfec 100644
--- a/actionpack/lib/action_controller/base/streaming.rb
+++ b/actionpack/lib/action_controller/base/streaming.rb
@@ -4,10 +4,7 @@ module ActionController #:nodoc:
   module Streaming
     extend ActiveSupport::Concern
 
-    # TODO : Remove the defined? check when new base is the main base
-    if defined?(ActionController::Http)
-      include ActionController::Renderer
-    end
+    include ActionController::Renderer
 
     DEFAULT_SEND_FILE_OPTIONS = {
       :type         => 'application/octet-stream'.freeze,
-- 
cgit v1.2.3