diff --git a/app/Http/Controllers/GoogleAuthController.php b/app/Http/Controllers/GoogleAuthController.php index 5a5960b0ac..84e428af3c 100644 --- a/app/Http/Controllers/GoogleAuthController.php +++ b/app/Http/Controllers/GoogleAuthController.php @@ -52,7 +52,7 @@ class GoogleAuthController extends Controller if ($user) { - + $user->update([ 'avatar' => $socialUser->avatar, ]); diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php index aaae6aa619..e9091cebb9 100644 --- a/resources/views/settings/google.blade.php +++ b/resources/views/settings/google.blade.php @@ -70,7 +70,13 @@ {{ Form::label('google_client_secret', 'Client Secret') }}
- {{ Form::text('google_client_secret', old('google_client_secret', $setting->google_client_secret), ['class' => 'form-control','placeholder' => trans('general.example') .'XXXXXXXXXXXX', (config('app.lock_passwords')===true) ? 'disabled': '']) }} + + @if (config('app.lock_passwords')===true) + {{ Form::text('google_client_secret', 'XXXXXXXXXXXXXXXXXXXXXXX', ['class' => 'form-control', 'disabled']) }} + @else + {{ Form::text('google_client_secret', old('google_client_secret', $setting->google_client_secret), ['class' => 'form-control','placeholder' => trans('general.example') .'XXXXXXXXXXXX']) }} + @endif + {!! $errors->first('google_client_secret', '') !!} @if (config('app.lock_passwords')===true)

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