aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/new_base/url_for.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/new_base/url_for.rb')
-rw-r--r--actionpack/lib/action_controller/new_base/url_for.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/new_base/url_for.rb b/actionpack/lib/action_controller/new_base/url_for.rb
index 94de9fab50..7119c14cd3 100644
--- a/actionpack/lib/action_controller/new_base/url_for.rb
+++ b/actionpack/lib/action_controller/new_base/url_for.rb
@@ -1,5 +1,9 @@
module ActionController
module UrlFor
+ extend ActiveSupport::Concern
+
+ include RackConvenience
+
def process_action(*)
initialize_current_url
super
@@ -21,7 +25,7 @@ module ActionController
# by this method.
def default_url_options(options = nil)
end
-
+
def rewrite_options(options) #:nodoc:
if defaults = default_url_options(options)
defaults.merge(options)
@@ -29,7 +33,7 @@ module ActionController
options
end
end
-
+
def url_for(options = {})
options ||= {}
case options
@@ -42,4 +46,4 @@ module ActionController
end
end
end
-end \ No newline at end of file
+end