@@ -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] lib/merb-core/bootloader.rb ebf1531725a1fe078a9d85a23d84129d3b95bb01 Michael D'Auria michael.dauria@gmail.com http://github.com/wycats/merb-core/commit/b3fa33a6e565fcbbca03b64b8ff2d066a9ec60c4 b3fa33a6e565fcbbca03b64b8ff2d066a9ec60c4 2008-06-04T20:41:29-07:00 2008-06-03T18:56:24-07:00 properly set the session_id_key Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 02f46c47eb23e5ef024ae70cc116f228f07c00f3 Ezra Zygmuntowicz ez@engineyard.com