0
@@ -1,5 +1,7 @@
0
 *1.12.1* (April 6th, 2005)
0
 
0
+* Refinement to avoid exceptions in traverse_to_controller.
0
+
0
 * (Hackish) Fix loading of arbitrary files in Ruby's load path by traverse_to_controller. [Nicholas Seckar]
0
 
0
 * Fixed that template extensions would be cached development mode #4624 [Stefan Kaes]

0
@@ -247,6 +247,7 @@ module ActionController
0
             
0
             if mod.const_defined? mod_name
0
               next_mod = mod.send(:const_get, mod_name)
0
+              next_mod = nil unless next_mod.is_a?(Module)
0
             else
0
               suffix = File.join(segments[start_at..index])
0
               $:.each do |base|

0
@@ -6,6 +6,7 @@ class NotAController
0
 end
0
 module Admin
0
   class << self; alias_method :const_available?, :const_defined?; end
0
+  SomeConstant = 10
0
   class UserController < Class.new(ActionController::Base); end
0
   class NewsFeedController < Class.new(ActionController::Base); end
0
 end

0
@@ -982,6 +982,10 @@ class ControllerComponentTest < Test::Unit::TestCase
0
     $:[0..-1] = load_path
0
   end
0
   
0
+  def test_traverse_should_not_trip_on_non_module_constants
0
+    assert_equal nil, ActionController::Routing::ControllerComponent.traverse_to_controller(%w(admin some_constant a))
0
+  end
0
+  
0
 end
0
 
0
 end