aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-03-09 21:25:09 -0600
committerJoshua Peek <josh@joshpeek.com>2010-03-09 21:25:09 -0600
commitdcd110c724aa5111e67e7264e6bc76ebdda6d50f (patch)
treef11f3480112e0aa6a85c4a90904048ebf23f0293 /actionpack/lib/action_controller/caching
parent1cc2a61ea655fea246f4c3e22a9e4a494e99d952 (diff)
downloadrails-dcd110c724aa5111e67e7264e6bc76ebdda6d50f.tar.gz
rails-dcd110c724aa5111e67e7264e6bc76ebdda6d50f.tar.bz2
rails-dcd110c724aa5111e67e7264e6bc76ebdda6d50f.zip
skip_relative_url_root url_for option is dead
Diffstat (limited to 'actionpack/lib/action_controller/caching')
-rw-r--r--actionpack/lib/action_controller/caching/pages.rb6
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