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

Changeset 6052

Show
Ignore:
Timestamp:
01/28/07 04:57:05 (2 years ago)
Author:
ulysses
Message:

Fix overly greedy rescues when loading helpers. Closes #6268

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/actionpack/CHANGELOG

    r6045 r6052  
    11*SVN* 
     2 
     3* Fix overly greedy rescues when loading helpers. Fixes #6268. [Nicholas Seckar] 
    24 
    35* Fixed NumberHelper#number_with_delimiter to use "." always for splitting the original number, not the delimiter parameter #7389 [ceefour] 
  • trunk/actionpack/lib/action_controller/helpers.rb

    r4952 r6052  
    111111          require_dependency module_path 
    112112          helper module_name.constantize 
    113         rescue LoadError 
     113        rescue LoadError => e 
     114          raise unless e.is_missing? module_path 
    114115          logger.debug("#{name}: missing default helper path #{module_path}") if logger 
    115         rescue NameError 
     116        rescue NameError => e 
     117          raise unless e.missing_name? module_name 
    116118          logger.debug("#{name}: missing default helper module #{module_name}") if logger 
    117119        end