diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/caching/fragments.rb | 26 | ||||
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 16 |
2 files changed, 0 insertions, 42 deletions
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb index e9b434dd25..31cbe27452 100644 --- a/actionpack/lib/action_controller/caching/fragments.rb +++ b/actionpack/lib/action_controller/caching/fragments.rb @@ -26,32 +26,6 @@ module ActionController #:nodoc: # # expire_fragment(:controller => "topics", :action => "list", :action_suffix => "all_topics") module Fragments - def self.included(base) #:nodoc: - base.class_eval do - class << self - def fragment_cache_store=(store_option) #:nodoc: - ActiveSupport::Deprecation.warn('The fragment_cache_store= method is now use cache_store=') - self.cache_store = store_option - end - - def fragment_cache_store #:nodoc: - ActiveSupport::Deprecation.warn('The fragment_cache_store method is now use cache_store') - cache_store - end - end - - def fragment_cache_store=(store_option) #:nodoc: - ActiveSupport::Deprecation.warn('The fragment_cache_store= method is now use cache_store=') - self.cache_store = store_option - end - - def fragment_cache_store #:nodoc: - ActiveSupport::Deprecation.warn('The fragment_cache_store method is now use cache_store') - cache_store - end - end - end - # Given a key (as described in <tt>expire_fragment</tt>), returns a key suitable for use in reading, # writing, or expiring a cached fragment. If the key is a hash, the generated key is the return # value of url_for on that hash (without the protocol). All keys are prefixed with "views/" and uses 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) |