From 451ab45321527b3c0999e33700dbb4439da5387a Mon Sep 17 00:00:00 2001 From: Jonathan Younger Date: Sun, 9 Mar 2008 14:52:07 -0600 Subject: [PATCH] Fix configuring session_id_key so that it works --- lib/merb-core/bootloader.rb | 2 +- lib/merb-core/controller/merb_controller.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/merb-core/bootloader.rb b/lib/merb-core/bootloader.rb index 2ba257c..a2a18eb 100644 --- a/lib/merb-core/bootloader.rb +++ b/lib/merb-core/bootloader.rb @@ -435,8 +435,8 @@ class Merb::BootLoader::MixinSessionContainer < Merb::BootLoader elsif reg = Merb.registered_session_types[session_store] if session_store == "cookie" Merb::BootLoader::MixinSessionContainer.check_for_secret_key - Merb::BootLoader::MixinSessionContainer.check_for_session_id_key end + Merb::BootLoader::MixinSessionContainer.check_for_session_id_key require reg[:file] include ::Merb::SessionMixin Merb.logger.warn reg[:description] diff --git a/lib/merb-core/controller/merb_controller.rb b/lib/merb-core/controller/merb_controller.rb index 5b39245..185d8b4 100644 --- a/lib/merb-core/controller/merb_controller.rb +++ b/lib/merb-core/controller/merb_controller.rb @@ -1,7 +1,7 @@ class Merb::Controller < Merb::AbstractController - class_inheritable_accessor :_session_id_key, :_session_expiry, :_hidden_actions, :_shown_actions - cattr_accessor :_subclasses, :_session_secret_key + class_inheritable_accessor :_hidden_actions, :_shown_actions + cattr_accessor :_subclasses, :_session_id_key, :_session_secret_key, :_session_expiry self._subclasses = Set.new def self.subclasses_list() _subclasses end -- 1.5.4.3