From 30019a144a8feef86ece05ef4aa4af4362c0724e Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 22 Sep 2017 17:23:22 -0700 Subject: [PATCH] Disable login note editing on demo --- app/Http/Controllers/SettingsController.php | 5 ++++- resources/views/settings/general.blade.php | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index c82b8bf2e2..686c283b1a 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -338,7 +338,10 @@ class SettingsController extends Controller $setting->email_format = $request->input('email_format'); $setting->username_format = $request->input('username_format'); $setting->require_accept_signature = $request->input('require_accept_signature'); - $setting->login_note = $request->input('login_note'); + if (config('app.lock_passwords')) { + $setting->login_note = $request->input('login_note'); + } + $setting->default_eula_text = $request->input('default_eula_text'); $setting->thumbnail_max_h = $request->input('thumbnail_max_h'); diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index 01eeab2d9a..01a68340ff 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -165,9 +165,9 @@ {{ Form::label('login_note', trans('admin/settings/general.login_note')) }}
- @if (config('app.lock_passwords')===true) + @if (config('app.lock_passwords')) - + {!! $errors->first('login_note', ':message') !!}

{{ trans('general.lock_passwords') }}

@else