From 0730685c29f376fa3d71905861459d2ba40a3fcc Mon Sep 17 00:00:00 2001 From: Wes Hulette Date: Thu, 1 Nov 2018 16:36:30 -0400 Subject: [PATCH] v5 Develop Fixed: LDAP Settings Password being updated when field is empty (#6384) * Fixed missing oauth tables during setup. * Fixed password saving Previous Input::has always returned true, even if password was an empty string. --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index d1b4bd7ed2..19d2f4839b 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -869,7 +869,7 @@ class SettingsController extends Controller $setting->ldap_server = $request->input('ldap_server'); $setting->ldap_server_cert_ignore = $request->input('ldap_server_cert_ignore', false); $setting->ldap_uname = $request->input('ldap_uname'); - if (Input::has('ldap_pword')) { + if ($request->input('ldap_pword') !== '') { $setting->ldap_pword = Crypt::encrypt($request->input('ldap_pword')); } $setting->ldap_basedn = $request->input('ldap_basedn');