From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 24 Jan 2022 02:29:03 +0000 (+0100)
Subject: Fix link_to_login argument handling when a block is passed (#17345)
X-Git-Url: https://awoo.directory/?a=commitdiff_plain;h=dd63923c0ae3601de76dee5bcf3a83f875584326;p=mastodon.git

Fix link_to_login argument handling when a block is passed (#17345)
---

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9e16de5b5..36c66b7d1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -64,6 +64,8 @@ module ApplicationHelper
   def link_to_login(name = nil, html_options = nil, &block)
     target = new_user_session_path
 
+    html_options = name if block_given?
+
     if omniauth_only? && Devise.mappings[:user].omniauthable? && User.omniauth_providers.size == 1
       target = omniauth_authorize_path(:user, User.omniauth_providers[0])
       html_options ||= {}