Changeset 4750

Timestamp:

08/10/06 17:13:55 (2 years ago)

Author:

ulysses

Message:

Can't use controller_path due to Admin model and Admin::UserController case

Files:

• branches/stable/actionpack/lib/action_controller/routing.rb (modified) (1 diff)
• branches/stable/railties/lib/initializer.rb (modified) (1 diff)

branches/stable/actionpack/lib/action_controller/routing.rb

@@ -263 +263 @@
-        end
-        
-        attr_accessor :controller_paths
-        
-      protected
+        def safe_load_paths #:nodoc:
+          if defined?(RAILS_ROOT)
+            $LOAD_PATH.select do |base|
+              base = File.expand_path(base)
+              extended_root = File.expand_path(RAILS_ROOT)
+              # Exclude all paths that are not nested within app, lib, or components.
+              base.match(/\A#{Regexp.escape(extended_root)}\/*(app|lib|components)\/[a-z]/) || base =~ %r{rails-[\d.]+/builtin}
+            end
+          else
+            $LOAD_PATH
+          end
+        end
-        
-        def attempt_load(mod, const_name, path)
-          has_dir = false
-controller
+safe_load
-            full_path = File.join(load_path, path)
-            file_path = full_path + '.rb'

branches/stable/railties/lib/initializer.rb

@@ -237 +237 @@
-    def initialize_routing
-      return unless configuration.frameworks.include?(:action_controller)
-      ActionController::Routing::ControllerComponent.controller_paths = configuration.controller_paths
-      ActionController::Routing::Routes.reload
-    end