aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/helpers/url_helper.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-05-01 10:50:01 +0200
committerYves Senn <yves.senn@gmail.com>2015-05-01 10:54:23 +0200
commitd459b001b43d25053e7982e96eb8383538a6e358 (patch)
tree2a72ebc5e9439d79fe7654e13d20bae4ccb73333 /actionview/lib/action_view/helpers/url_helper.rb
parent4d4950fae9e2a6970b5f1793aadc56a0b44e28a3 (diff)
parent58c3a0451260dfd693b47d561cf623cce1b38b99 (diff)
downloadrails-d459b001b43d25053e7982e96eb8383538a6e358.tar.gz
rails-d459b001b43d25053e7982e96eb8383538a6e358.tar.bz2
rails-d459b001b43d25053e7982e96eb8383538a6e358.zip
Merge pull request #19844 from stevenspiel/link_to_if_block_helper_addition
Update url_helper.rb
Diffstat (limited to 'actionview/lib/action_view/helpers/url_helper.rb')
-rw-r--r--actionview/lib/action_view/helpers/url_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb
index afb1265ad9..de1ef7af45 100644
--- a/actionview/lib/action_view/helpers/url_helper.rb
+++ b/actionview/lib/action_view/helpers/url_helper.rb
@@ -410,7 +410,7 @@ module ActionView
# # => <a href="/accounts/show/3">my_username</a>
def link_to_if(condition, name, options = {}, html_options = {}, &block)
if condition
- link_to(name, options, html_options)
+ link_to(name, options, html_options, &block)
else
if block_given?
block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)