Fixing #1344804: Add check for encryption options to webform_encrypt_webform_component_presave()

2a165291 · akoepke · Jake Bell · 8f169744 · 2a165291
Commit 2a165291 authored Jul 23, 2012 by akoepke Committed by Jake Bell Jul 23, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

webform_encrypt.module webform_encrypt.module +4 -2

No files found.
--- a/webform_encrypt.module
+++ b/webform_encrypt.module
@@ -63,8 +63,10 @@ function webform_encrypt_form_alter(&$form, $form_state, $form_id) {
 * Save encryption settings for a component.
 */
 function webform_encrypt_webform_component_presave(&$component) {
-  $component['extra'] = array_merge($component['extra'], $component['encryption']);
-  unset($component['encryption']);
+  if (!empty($component['encryption'])) {
+    $component['extra'] = array_merge($component['extra'], $component['encryption']);
+    unset($component['encryption']);
+  }
 }

 /**