Changeset 1321

Show
Ignore:
Timestamp:
01/18/08 15:35:41 (9 months ago)
Author:
dudl..@misnomer.us
Message:

Made the asset bundler check for an environment string, not a symbol.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/merb/assets.rb

    r1228 r1321  
    55    # :bundle_assets is explicitly enabled), false if not. 
    66    def self.bundle? 
    7       (Merb::Config[:environment] == :production) || 
     7      (Merb::Config[:environment].to_s == 'production') || 
    88      (!!Merb::Config[:bundle_assets]) 
    99    end