aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-09-04 03:36:13 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-09-04 03:36:13 +0000
commit29f04510e9529a7f3b1e09a6ec6e8f296e7c0993 (patch)
tree90e69d6c1c890070a22727dc9b56a6b402b83660 /actionpack
parent6ca6c5de3ab8a60a384d0d3a91877ab83b749835 (diff)
downloadrails-29f04510e9529a7f3b1e09a6ec6e8f296e7c0993.tar.gz
rails-29f04510e9529a7f3b1e09a6ec6e8f296e7c0993.tar.bz2
rails-29f04510e9529a7f3b1e09a6ec6e8f296e7c0993.zip
pass caller to deprecation warning
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4965 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rwxr-xr-xactionpack/lib/action_controller/base.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index ad165d5eb5..8daeab342a 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -491,7 +491,8 @@ module ActionController #:nodoc:
when Symbol
ActiveSupport::Deprecation.warn(
"You called url_for(:#{options}), which is a deprecated API call. Instead you should use the named " +
- "route directly, like #{options}(). Using symbols and parameters with url_for will be removed from Rails 2.0."
+ "route directly, like #{options}(). Using symbols and parameters with url_for will be removed from Rails 2.0.",
+ caller
)
send(options, *parameters_for_method_reference)
@@ -681,7 +682,8 @@ module ActionController #:nodoc:
else
ActiveSupport::Deprecation.warn(
"You called render('#{options}'), which is a deprecated API call. Instead you use " +
- "render :file => #{options}. Calling render with just a string will be removed from Rails 2.0."
+ "render :file => #{options}. Calling render with just a string will be removed from Rails 2.0.",
+ caller
)
return render_file(options, deprecated_status, true)