diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-10 22:17:44 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-10 22:17:44 +0100 |
| commit | 84f6da45a19d335be320991cab44f492f61dc5c7 (patch) | |
| tree | fcae699ac5cccf109ecc26d42bdbc039405f4501 /actionpack/lib/action_controller/caching/pages.rb | |
| parent | 07cf49aadf3195db6ddefc58932efc88a6704a09 (diff) | |
| parent | 181c414baa877d748671d03fb09499c10f81ec02 (diff) | |
| download | rails-84f6da45a19d335be320991cab44f492f61dc5c7.tar.gz rails-84f6da45a19d335be320991cab44f492f61dc5c7.tar.bz2 rails-84f6da45a19d335be320991cab44f492f61dc5c7.zip | |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/caching/pages.rb')
| -rw-r--r-- | actionpack/lib/action_controller/caching/pages.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb index 36a97d390c..fe95f0e0d7 100644 --- a/actionpack/lib/action_controller/caching/pages.rb +++ b/actionpack/lib/action_controller/caching/pages.rb @@ -121,10 +121,10 @@ module ActionController #:nodoc: if options.is_a?(Hash) if options[:action].is_a?(Array) options[:action].dup.each do |action| - self.class.expire_page(url_for(options.merge(:only_path => true, :skip_relative_url_root => true, :action => action))) + self.class.expire_page(url_for(options.merge(:only_path => true, :action => action))) end else - self.class.expire_page(url_for(options.merge(:only_path => true, :skip_relative_url_root => true))) + self.class.expire_page(url_for(options.merge(:only_path => true))) end else self.class.expire_page(options) @@ -139,7 +139,7 @@ module ActionController #:nodoc: path = case options when Hash - url_for(options.merge(:only_path => true, :skip_relative_url_root => true, :format => params[:format])) + url_for(options.merge(:only_path => true, :format => params[:format])) when String options else |