diff options
author | Ryan Bigg <radarlistener@gmail.com> | 2008-10-22 21:46:49 +1030 |
---|---|---|
committer | Ryan Bigg <radarlistener@gmail.com> | 2008-10-22 21:46:49 +1030 |
commit | 4a53eb8a79e3e0535ba19e6da38370a542ce4961 (patch) | |
tree | 965418cb69895e44879c7b1fa428e808b91aa66a /actionpack/lib/action_view/base.rb | |
parent | a325010d6c9b2c69cab5da046e1106aad491b73f (diff) | |
parent | 303919c62660c68ca450a53ec5ef29ec2c615b7a (diff) | |
download | rails-4a53eb8a79e3e0535ba19e6da38370a542ce4961.tar.gz rails-4a53eb8a79e3e0535ba19e6da38370a542ce4961.tar.bz2 rails-4a53eb8a79e3e0535ba19e6da38370a542ce4961.zip |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 8df10c40cc..e22978fe27 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -172,18 +172,6 @@ module ActionView #:nodoc: delegate :logger, :to => 'ActionController::Base' end - def self.cache_template_loading=(*args) - ActiveSupport::Deprecation.warn( - "config.action_view.cache_template_loading option has been deprecated" + - "and has no effect. Please remove it from your config files.", caller) - end - - def self.cache_template_extensions=(*args) - ActiveSupport::Deprecation.warn( - "config.action_view.cache_template_extensions option has been" + - "deprecated and has no effect. Please remove it from your config files.", caller) - end - # Templates that are exempt from layouts @@exempt_from_layout = Set.new([/\.rjs$/]) @@ -259,10 +247,6 @@ module ActionView #:nodoc: if options[:layout] _render_with_layout(options, local_assigns, &block) elsif options[:file] - if options[:use_full_path] - ActiveSupport::Deprecation.warn("use_full_path option has been deprecated and has no affect.", caller) - end - _pick_template(options[:file]).render_template(self, options[:locals]) elsif options[:partial] render_partial(options) |