From 80176ae59e3aa17a047182d837fadf9b5a12f77e Mon Sep 17 00:00:00 2001 From: Hendrik Grahl Date: Mon, 16 May 2016 15:39:20 +0200 Subject: [PATCH] Fix get() on null --- ldap_servers/src/Form/ServerForm.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ldap_servers/src/Form/ServerForm.php b/ldap_servers/src/Form/ServerForm.php index 9b90a36..11b1f47 100644 --- a/ldap_servers/src/Form/ServerForm.php +++ b/ldap_servers/src/Form/ServerForm.php @@ -498,7 +498,9 @@ class ServerForm extends EntityForm { // If there isn't a password then load the existing one (unless this an anonymous bind server) elseif ( $form_state->getValue('bind_method') != LDAP_SERVERS_BIND_METHOD_ANON || $form_state->getValue('bind_method') != LDAP_SERVERS_BIND_METHOD_ANON_USER ) { $entity = ldap_servers_get_servers($server->id()); - $server->set('bindpw', $entity->get('bindpw')); + if ($server->get('bindpw')) { + $server->set('bindpw', $entity->get('bindpw')); + } } $status = $server->save(); -- 2.7.3