From 855b3809d079ecedfbc5492f0d95c07048d8b247 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 11 Feb 2016 12:06:06 -0800 Subject: [PATCH] Only import settings if there is a need to --- .../migrations/2015_11_26_195528_import_ldap_settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/database/migrations/2015_11_26_195528_import_ldap_settings.php b/app/database/migrations/2015_11_26_195528_import_ldap_settings.php index 311fe16d01..1529c4058f 100644 --- a/app/database/migrations/2015_11_26_195528_import_ldap_settings.php +++ b/app/database/migrations/2015_11_26_195528_import_ldap_settings.php @@ -18,8 +18,8 @@ class ImportLdapSettings extends Migration { // Only update the settings record if there IS an LDAP Config // AND the Settings table doesn't already have LDAP settings in it - if ((Config::get('ldap.url')) && ($settings->ldap_server=='')) { - + if ((Config::get('ldap.url')) && ($settings) && ($settings->ldap_server)) { + $settings->ldap_enabled = 1; $settings->ldap_server = Config::get('ldap.url'); $settings->ldap_uname = Config::get('ldap.username');