Merge pull request #4875 from pixelfed/staging

Update forgot email captcha config

app/Http/Controllers/UserEmailForgotController.php

@@ -34,7 +34,7 @@ class UserEmailForgotController extends Controller
             'username.exists' => 'This username is no longer active or does not exist!'
         ];
 
-        if(config('captcha.enabled') || config('captcha.active.register')) {
+        if(config('captcha.enabled') || config('captcha.active.login') || config('captcha.active.register')) {
             $rules['h-captcha-response'] = 'required|captcha';
             $messages['h-captcha-response.required'] = 'You need to complete the captcha!';
         }

resources/views/auth/email/forgot.blade.php

@@ -65,7 +65,7 @@
                                 </div>
                             </div>
 
-                            @if(config('captcha.enabled'))
+                            @if(config('captcha.enabled') || config('captcha.active.login') || config('captcha.active.register'))
                             <label class="font-weight-bold small text-muted">Captcha</label>
                             <div class="d-flex flex-grow-1">
                                 {!! Captcha::display(['data-theme' => 'dark']) !!}