Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 5802

Show
Ignore:
Timestamp:
12/27/06 22:19:36 (2 years ago)
Author:
rick
Message:

apply [5801] to 1.2 stable branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1-2-pre-release/railties/CHANGELOG

    r5791 r5802  
    11*SVN* 
     2 
     3* Ensure plugins are in the Dependencies.load_once_paths collection by default.  [Rick] 
     4  If you really want your plugins to reload, add this to the very top of init.rb: 
     5   
     6    Dependencies.load_once_paths.delete(lib_path) 
    27 
    38* Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file.  Closes #6852 [fearoffish] 

  • branches/1-2-pre-release/railties/lib/initializer.rb

    r5739 r5802  
    389389          $LOAD_PATH.insert(application_lib_index + 1, lib_path) 
    390390          Dependencies.load_paths << lib_path 
     391          Dependencies.load_once_paths << lib_path 
    391392        end 
    392393 
    …… 
    612613      end 
    613614 
     615      # Doesn't matter since plugins aren't in load_paths yet. 
    614616      def default_load_once_paths 
    615         plugin_root = "#{root_path}/vendor/plugins/" 
    616         default_load_paths.select do |path| 
    617           path[0, plugin_root.length] == plugin_root # No begins_with yet 
    618         end 
     617        [] 
    619618      end 
    620619