From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 24 Jan 2022 21:12:57 +0000 (+0100)
Subject: Disable captcha if registrations are disabled for various reasons
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bf351d72af76e80a29674770d9991de955f95d34;p=mastodon.git

Disable captcha if registrations are disabled for various reasons
---

diff --git a/app/controllers/concerns/captcha_concern.rb b/app/controllers/concerns/captcha_concern.rb
index 5bc4ba920..4a942c988 100644
--- a/app/controllers/concerns/captcha_concern.rb
+++ b/app/controllers/concerns/captcha_concern.rb
@@ -23,6 +23,8 @@ module CaptchaConcern
   end
 
   def captcha_required?
+    return false if ENV['OMNIAUTH_ONLY'] == 'true'
+    return false unless Setting.registrations_mode != 'none' || @invite&.valid_for_use?
     captcha_enabled? && !current_user && !(@invite.present? && @invite.valid_for_use? && !@invite.max_uses.nil?) && !captcha_recently_passed?
   end