Changeset 510
- Timestamp:
- 01/25/05 18:35:16 (4 years ago)
- Files:
-
- trunk/actionpack/lib/action_controller/helpers.rb (modified) (1 diff)
- trunk/activesupport/lib/dependencies.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/helpers.rb
r508 r510 97 97 begin 98 98 child.helper(child.controller_name) 99 rescue Object99 rescue NameError, LoadError 100 100 # No default helper available for this controller 101 101 end trunk/activesupport/lib/dependencies.rb
r509 r510 19 19 begin 20 20 require_or_load(file_name) 21 rescue LoadError 22 raise unless swallow_load_errors 21 23 rescue Object => e 22 raise ScriptError, "#{e.message}" unless e.is_a?(LoadError) && swallow_load_errors24 raise ScriptError, "#{e.message}" 23 25 end 24 26 end
