Skip to content

Commit

Permalink
properly set the session_id_key
Browse files Browse the repository at this point in the history
Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
  • Loading branch information
michaeldauria authored and Ezra Zygmuntowicz committed Jun 5, 2008
1 parent ebf1531 commit b3fa33a
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions lib/merb-core/bootloader.rb
Expand Up @@ -550,10 +550,8 @@ def self.run
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]
Expand Down

0 comments on commit b3fa33a

Please sign in to comment.