diff options
| author | rick <technoweenie@gmail.com> | 2008-07-16 14:20:15 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-07-16 14:20:15 -0700 |
| commit | 0a6d75dedd79407376aae1f01302164dfd3e44b6 (patch) | |
| tree | dfef7e73b3b19a65895651c82cb6e0b727394eab /activesupport/lib/active_support/dependencies.rb | |
| parent | a14cedc7797aef4ccd9da46ed73e36d730392814 (diff) | |
| parent | fc89a951933638b051bb1f9e1339ee6ae7c94cda (diff) | |
| download | rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.tar.gz rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.tar.bz2 rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.zip | |
merge with local tweaks
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index d3d9ff9de4..2f3fa72bb4 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -387,7 +387,7 @@ module ActiveSupport #:nodoc: ensure # Remove the stack frames that we added. if defined?(watch_frames) && ! watch_frames.blank? - frame_ids = watch_frames.collect(&:object_id) + frame_ids = watch_frames.collect { |frame| frame.object_id } constant_watch_stack.delete_if do |watch_frame| frame_ids.include? watch_frame.object_id end @@ -437,7 +437,7 @@ module ActiveSupport #:nodoc: protected def log_call(*args) if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity - arg_str = args.collect(&:inspect) * ', ' + arg_str = args.collect { |arg| arg.inspect } * ', ' /in `([a-z_\?\!]+)'/ =~ caller(1).first selector = $1 || '<unknown>' log "called #{selector}(#{arg_str})" |