aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-09-05 22:08:33 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-09-05 22:08:33 +0000
commitbd09d9aafb56912ba384a20ac3dfd7bfd7a784e4 (patch)
tree41df16a94274d5a814b747b4e3d5eb84752710b7 /actionpack
parent9598176390b624bece9c4e2f9aecb68e0cc95871 (diff)
downloadrails-bd09d9aafb56912ba384a20ac3dfd7bfd7a784e4.tar.gz
rails-bd09d9aafb56912ba384a20ac3dfd7bfd7a784e4.tar.bz2
rails-bd09d9aafb56912ba384a20ac3dfd7bfd7a784e4.zip
caller is necessary for proper trace in deprecation
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5021 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/flash.rb2
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb
index 6721a69d8c..9f50b9571d 100644
--- a/actionpack/lib/action_controller/flash.rb
+++ b/actionpack/lib/action_controller/flash.rb
@@ -174,7 +174,7 @@ module ActionController #:nodoc:
# deprecated. use <tt>flash.keep</tt> instead
def keep_flash #:doc:
- ActiveSupport::Deprecation.warn 'keep_flash is deprecated; use flash.keep instead.'
+ ActiveSupport::Deprecation.warn 'keep_flash is deprecated; use flash.keep instead.', caller
flash.keep
end
end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index d31b42b565..93f04968f9 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -126,7 +126,7 @@ module ActionView
ActiveSupport::Deprecation.warn(
"You've called image_path with a source that doesn't include an extension. " +
"In Rails 2.0, that will not result in .png automatically being appended. " +
- "So you should call image_path('#{source}.png') instead"
+ "So you should call image_path('#{source}.png') instead", caller
)
end