Changeset 1259

Show
Ignore:
Timestamp:
01/10/08 07:52:26 (8 months ago)
Author:
iv..@gweezlebur.com
Message:

Fix autoloader (Closes #433) Thanks siebertm

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/boot_loader.rb

    r1252 r1259  
    163163       
    164164      def reload 
    165         return if !Merb::Config[:reloader] || !Object.const_defined?(:MERB_PATHS) 
     165        return if !Merb::Config[:reloader] 
    166166         
    167167        # First we collect all files in the project (this will also grab newly added files) 
    168         project_files = MERB_PATHS.map { |path| Dir[Merb.root + path] }.flatten.uniq 
     168        project_files = Merb.load_paths.map { |path| Dir[Merb.root + path] }.flatten.uniq 
    169169        partials = template_paths("_*.*").map { |path| Dir[path] }.flatten.uniq 
    170170        project_mtime = max_mtime(project_files + partials) # Latest changed time of all project files