From 00b6f024d731a220345ba55dfcc3249d36eedab3 Mon Sep 17 00:00:00 2001 From: Michael D'Auria Date: Tue, 3 Jun 2008 21:56:24 -0400 Subject: [PATCH] properly set the session_id_key --- lib/merb-core/bootloader.rb | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/merb-core/bootloader.rb b/lib/merb-core/bootloader.rb index 2fe6626..c8d7e86 100644 --- a/lib/merb-core/bootloader.rb +++ b/lib/merb-core/bootloader.rb @@ -550,10 +550,8 @@ class Merb::BootLoader::MixinSessionContainer < Merb::BootLoader if ["", "false", "none"].include?(session_store) Merb.logger.warn "Not Using Sessions" 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_secret_key if session_store == "cookie" + Merb::BootLoader::MixinSessionContainer.check_for_session_id_key require reg[:file] include ::Merb::SessionMixin Merb.logger.warn reg[:description] -- 1.5.5.1