Removed setting override system due to confusing behaviour

- Was only used to disable registration when LDAP was enabled.
- Caused saved option not to show on settings page causing confusion.
- Extended setting logic where used to take ldap into account instead of
global override.
- Added warning on setting page to show registration enable setting is
not used while ldap is active.

For #1541
This commit is contained in:
Dan Brown
2019-12-22 13:17:14 +00:00
parent 32e7f0a2e6
commit e06f9f7fe3
9 changed files with 11 additions and 28 deletions

View File

@ -55,7 +55,7 @@
</div>
@endif
@if(setting('registration-enabled', false))
@if(setting('registration-enabled') && config('auth.method') !== 'ldap')
<div class="text-center pb-s">
<hr class="my-l">
<a href="{{ url('/register') }}">{{ trans('auth.dont_have_account') }}</a>