From: Dan Brown <redacted>
Date: Sat, 14 Mar 2020 17:46:30 +0000 (+0000)
Subject: Merge branch 'feature/public-login-redirect' of git://github.com/Xiphoseer/BookStack... 
X-Git-Tag: v0.28.3~1^2~7
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a95588dc2ea1d382b2a9533fbea7cc2b9adadd43

Merge branch 'feature/public-login-redirect' of git://github.com/Xiphoseer/BookStack into Xiphoseer-feature/public-login-redirect
---

a95588dc2ea1d382b2a9533fbea7cc2b9adadd43
diff --cc resources/views/common/header.blade.php
index 524e4a11a,2d3871ba0..3004acf3c
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@@ -42,10 -42,10 +42,10 @@@
                      @endif
  
                      @if(!signedInUser())
 -                        @if(setting('registration-enabled', false))
 -                            <a href="{{ url('/https/source.bookstackapp.com/register') }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
 +                        @if(setting('registration-enabled') && config('auth.method') === 'standard')
 +                            <a href="{{ url('/https/source.bookstackapp.com/register') }}">@icon('new-user'){{ trans('auth.sign_up') }}</a>
                          @endif
-                         <a href="{{ url('/https/source.bookstackapp.com/login') }}">@icon('login'){{ trans('auth.log_in') }}</a>
 -                        <a href="{{ action('Auth\LoginController@getLogin', ['intended' => url()->current()]) }}">@icon('login') {{ trans('auth.log_in') }}</a>
++                        <a href="{{ action('Auth\LoginController@getLogin', ['intended' => url()->current()]) }}">@icon('login'){{ trans('auth.log_in') }}</a>
                      @endif
                  </div>
                  @if(signedInUser())