Changeset 5631
- Timestamp:
- 11/26/06 01:24:10 (2 years ago)
- Files:
-
- trunk/actionpack/lib/action_controller/components.rb (modified) (1 diff)
- trunk/actionpack/test/controller/components_test.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/components.rb
r5536 r5631 76 76 # and find templates in /code/weblog/components/admin/parties/users/ 77 77 def uses_component_template_root 78 path_of_calling_controller = File.dirname(caller[ 0].split(/:\d+:/, 2).first)78 path_of_calling_controller = File.dirname(caller[1].split(/:\d+:/, 2).first) 79 79 path_of_controller_root = path_of_calling_controller.sub(/#{Regexp.escape(File.dirname(controller_path))}$/, "") 80 80 trunk/actionpack/test/controller/components_test.rb
r5536 r5631 135 135 # Stub for uses_component_template_root 136 136 def self.caller 137 ['./test/fixtures/a/b/c/nested_controller.rb'] 137 [ '/path/to/active_support/deprecation.rb:93:in `uses_component_template_root', 138 './test/fixtures/a/b/c/nested_controller.rb' ] 138 139 end 139 140 end
