0
@@ -154,13 +154,6 @@ class Merb::Controller < Merb::AbstractController
0
   # @semipublic
0
   def initialize(request, status=200, headers={'Content-Type' => 'text/html; charset=utf-8'})
0
     super()
0
-    if request.params.key?(_session_id_key)
0
-      # Checks to see if a route allows fixation: 
0
-      # r.match('/foo').to(:controller => 'foo').fixatable 
0
-      if request.route.allow_fixation?
0
-        request.cookies[_session_id_key] = request.params[_session_id_key]
0
-      end
0
-    end
0
     @request, @status, @headers = request, status, headers
0
   end
0
   
0
@@ -201,9 +194,21 @@ class Merb::Controller < Merb::AbstractController
0
   # ==== Note
0
   # Headers are passed into the cookie object so that you can do:
0
   #   cookies[:foo] = "bar"
0
-  def cookies() @_cookies ||= ::Merb::Cookies.new(request.cookies, @headers)  end
0
+  def cookies() @_cookies ||= _setup_cookies end
0
     
0
   # ==== Returns
0
   # Hash:: The session that was extracted from the request object.
0
   def session() request.session end
0
+    
0
+  private
0
+
0
+  # Create a default cookie jar, and pre-set a fixation cookie
0
+  # if fixation is enabled
0
+  def _setup_cookies
0
+    cookies = ::Merb::Cookies.new(request.cookies, @headers)
0
+    if request.params.key?(_session_id_key) && route.allow_fixation?
0
+      cookies[_session_id_key] = request.params[_session_id_key]
0
+    end
0
+    cookies
0
+  end
0
 end