[apigee#415] Fix WSOD when saving credentials.

minnur · Aug 3, 2020 · 769cae6 · 769cae6
1 parent 4e26460
commit 769cae6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Plugin/KeyInput/ApigeeAuthKeyInput.php b/src/Plugin/KeyInput/ApigeeAuthKeyInput.php
@@ -270,9 +270,11 @@ public function processSubmittedKeyValue(FormStateInterface $form_state) {
       else {
         $input_values['account_json_key'] = '';
         // If password field is empty we just skip it and preserve initial password.
-        $values = $this->getFormDefaultValues($form_state);
-        if (empty($input_values['password']) && !empty($values['password'])) {
-          $input_values['password'] = $values['password'];
+        if (empty($input_values['password'])) {
+          $values = $this->getFormDefaultValues($form_state);
+          if (!empty($values['password'])) {
+            $input_values['password'] = $values['password'];
+          }
         }
       }