diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-03 14:56:19 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-03 14:56:19 +0200 |
| commit | 3bf45890b323d0fbb5dbfa3e3a2e8f85c627679a (patch) | |
| tree | df534932145e9527e0aad6759919e21e9ffc9279 /activesupport/lib/active_support/new_callbacks.rb | |
| parent | b7bc68076c50714977aa7e990273a2ec92ba2e15 (diff) | |
| parent | a4bdc00fec623f72592e663e6d7830eea0bc6ea4 (diff) | |
| download | rails-3bf45890b323d0fbb5dbfa3e3a2e8f85c627679a.tar.gz rails-3bf45890b323d0fbb5dbfa3e3a2e8f85c627679a.tar.bz2 rails-3bf45890b323d0fbb5dbfa3e3a2e8f85c627679a.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport/lib/active_support/new_callbacks.rb')
| -rw-r--r-- | activesupport/lib/active_support/new_callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/new_callbacks.rb b/activesupport/lib/active_support/new_callbacks.rb index bc340fccec..56b510d52e 100644 --- a/activesupport/lib/active_support/new_callbacks.rb +++ b/activesupport/lib/active_support/new_callbacks.rb @@ -202,7 +202,7 @@ module ActiveSupport # end name = "_conditional_callback_#{@kind}_#{next_id}" - txt, line = <<-RUBY_EVAL, __LINE__ + txt, line = <<-RUBY_EVAL, __LINE__ + 1 def #{name}(halted) #{@compiled_options[0] || "if true"} && !halted #{@filter} do |