aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/url_helper.rb
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-03-16 14:55:42 -0700
committerCarlhuda <carlhuda@engineyard.com>2010-03-16 15:47:49 -0700
commit23b6def0eb76ac0719e420fce91ba862f880a37b (patch)
tree53ecc35cf7737fd3c3382ce54f07630d1021054d /actionpack/lib/action_view/helpers/url_helper.rb
parent3abf5ad7f8b23d955225ba96e82fd5565dd2571d (diff)
downloadrails-23b6def0eb76ac0719e420fce91ba862f880a37b.tar.gz
rails-23b6def0eb76ac0719e420fce91ba862f880a37b.tar.bz2
rails-23b6def0eb76ac0719e420fce91ba862f880a37b.zip
Do not always include the named URL helpers into AC::Base and AV::Base.
Diffstat (limited to 'actionpack/lib/action_view/helpers/url_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 94f1cecade..f877378ebe 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -9,6 +9,9 @@ module ActionView
# This allows you to use the same format for links in views
# and controllers.
module UrlHelper
+ extend ActiveSupport::Concern
+
+ include ActionDispatch::Routing::UrlFor
include JavaScriptHelper
# Need to map default url options to controller one.
@@ -16,6 +19,10 @@ module ActionView
controller.send(:default_url_options, *args)
end
+ def url_options
+ controller.url_options
+ end
+
# Returns the URL for the set of +options+ provided. This takes the
# same options as +url_for+ in Action Controller (see the
# documentation for <tt>ActionController::Base#url_for</tt>). Note that by default