aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2009-06-02 22:37:59 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-07-02 11:39:06 -0700
commit49bdbebca69cabea6e4cea6e09cb61dc990bb1f7 (patch)
tree732293fa20e259ec1ade124756c3ded69fa20ff1 /activesupport
parentab2d6abb55b45543656e2a0238857d3ba8379257 (diff)
downloadrails-49bdbebca69cabea6e4cea6e09cb61dc990bb1f7.tar.gz
rails-49bdbebca69cabea6e4cea6e09cb61dc990bb1f7.tar.bz2
rails-49bdbebca69cabea6e4cea6e09cb61dc990bb1f7.zip
wycats forgot a +1, so I added it [#2749 state:resolved]
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/new_callbacks.rb2
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