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 5bc4ba920513f4138d0e57968483de333d1ad90c..4a942c988814864a30f9c438c7ee4cd0c89352ea 100644 (file)
--- 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