Renamed Base2 to Base and don't require old action_controller for new Base

1 files changed, 21 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb
index 275a18abfd..db471f7658 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/actionpack/lib/action_controller/new_base/compatibility.rb
@@ -1,6 +1,27 @@
 module ActionController
   module Rails2Compatibility
   
+    # Temporary hax
+    setup do
+      cattr_accessor :session_options
+      self.send(:class_variable_set, "@@session_options", {})
+      
+      cattr_accessor :allow_concurrency
+      self.send(:class_variable_set, "@@allow_concurrency", false)
+      
+      cattr_accessor :param_parsers
+      self.send(:class_variable_set, "@@param_parsers", { Mime::MULTIPART_FORM   => :multipart_form,
+                          Mime::URL_ENCODED_FORM => :url_encoded_form,
+                          Mime::XML              => :xml_simple,
+                          Mime::JSON             => :json })
+                          
+      cattr_accessor :relative_url_root
+      self.send(:class_variable_set, "@@relative_url_root", ENV['RAILS_RELATIVE_URL_ROOT'])
+      
+      cattr_accessor :default_charset
+      self.send(:class_variable_set, "@@default_charset", "utf-8")
+    end
+  
     def render_to_body(options)
       if options.is_a?(Hash) && options.key?(:template)
         options[:template].sub!(/^\//, '')