Branch 'roundcubemail-plugins-kolab-3.0' - plugins/kolab_delegation
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Thu Feb 14 15:55:39 CET 2013
plugins/kolab_delegation/kolab_delegation_engine.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9a2e6653bc008ebf7dbd8744b420ef68e057d016
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Feb 14 09:54:15 2013 -0500
Make sure the organization for a delegator is not inserted as NULL in the database query adding the identity to the delegatee, as the database definition for the field is NOT NULL
diff --git a/plugins/kolab_delegation/kolab_delegation_engine.php b/plugins/kolab_delegation/kolab_delegation_engine.php
index 1d01b70..7b35f41 100644
--- a/plugins/kolab_delegation/kolab_delegation_engine.php
+++ b/plugins/kolab_delegation/kolab_delegation_engine.php
@@ -623,7 +623,8 @@ class kolab_delegation_engine
// @TODO: "Delegatorname" or "Username on behalf of Delegatorname"?
$default['name'] = $delegator['realname'];
$default['email'] = $email;
- $default['organization'] = $delegator['organization'];
+ // Database field for organization is NOT NULL
+ $default['organization'] = empty($delegator['organization']) ? '' : $delegator['organization'];
$this->rc->user->insert_identity($default);
}
More information about the commits
mailing list