From d68c46129820662734be8635d47d43b3bbcb13e3 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 27 Jul 2016 08:44:38 -0400
Subject: [PATCH] Avoid null attribute values (in case of strict DB settings).
---
module/VuFind/src/VuFind/Auth/LDAP.php | 2 +-
module/VuFind/src/VuFind/Auth/Shibboleth.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/module/VuFind/src/VuFind/Auth/LDAP.php b/module/VuFind/src/VuFind/Auth/LDAP.php
index 6b24fcb654b..e006e17f154 100644
--- a/module/VuFind/src/VuFind/Auth/LDAP.php
+++ b/module/VuFind/src/VuFind/Auth/LDAP.php
@@ -280,7 +280,7 @@ class LDAP extends AbstractBase
$value = $data[$i][$configValue][0];
$this->debug("found $field = $value");
if ($field != "cat_password") {
- $user->$field = $value;
+ $user->$field = ($value === null) ? '' : $value;
} else {
$catPassword = $value;
}
diff --git a/module/VuFind/src/VuFind/Auth/Shibboleth.php b/module/VuFind/src/VuFind/Auth/Shibboleth.php
index e837f5089c9..9a948e56a88 100644
--- a/module/VuFind/src/VuFind/Auth/Shibboleth.php
+++ b/module/VuFind/src/VuFind/Auth/Shibboleth.php
@@ -114,7 +114,7 @@ class Shibboleth extends AbstractBase
if (isset($shib->$attribute)) {
$value = $request->getServer()->get($shib->$attribute);
if ($attribute != 'cat_password') {
- $user->$attribute = $value;
+ $user->$attribute = ($value === null) ? '' : $value;
} else {
$catPassword = $value;
}
--
GitLab