Changeset 1225

Show
Ignore:
Timestamp:
01/09/08 09:56:31 (11 months ago)
Author:
v..@exdolo.com
Message:

only set :environment there if MERB_ENV is present, to prevent it overwriting the config as loaded by Merb::Config.setup in Merb::Server.merb_config

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/server.rb

    r1216 r1225  
    7272         
    7373        # Environment variables always win 
    74         options[:environment] = ENV['MERB_ENV'] 
     74        options[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
    7575 
    7676        # Build a parser for the command line arguements