From 304069f77d8d1d80d11f9ab7cccfe437ca508b5e Mon Sep 17 00:00:00 2001
From: Ted Bowman <ted.git@tedbow.com>
Date: Fri, 10 Feb 2012 14:28:15 -0500
Subject: [PATCH] by tedbow: added check before decrypting
---
field_encrypt.cache.inc | 1 -
field_encrypt.inc | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/field_encrypt.cache.inc b/field_encrypt.cache.inc
index cb19e93..7d0c72e 100644
--- a/field_encrypt.cache.inc
+++ b/field_encrypt.cache.inc
@@ -25,7 +25,6 @@ class FieldEncryptDatabaseCache extends DrupalDatabaseCache {
*/
protected function prepareItem($cache) {
global $user;
-
if (!isset($cache->data)) {
return FALSE;
}
diff --git a/field_encrypt.inc b/field_encrypt.inc
index 48f34d8..29fc9b7 100644
--- a/field_encrypt.inc
+++ b/field_encrypt.inc
@@ -27,7 +27,9 @@ function field_encrypt_do_encrypt($field_info, $phrase) {
$insert[$field] = $result->$field;
unset($result->$field);
}
- $insert['value'] = field_encrypt_encrypt(serialize($result), $field_info['settings']['field_encrypt']['phrase']); // encrypt here
+ if (isset($field_info['settings']['field_encrypt'])) {
+ $insert['value'] = field_encrypt_encrypt(serialize($result), $field_info['settings']['field_encrypt']['phrase']); // encrypt here
+ }
$inserts[] = $insert;
}
--
GitLab