File roundcubemail-plugins-kolab-3.0.1-identity-orga... of Package roundcubemail-plugins-kolab

File roundcubemail-plugins-kolab-3.0.1-identity-organization-field-null.patch of Package roundcubemail-plugins-kolab (Revision cdb4634bd259ec48217924ce9f3ad40b)

Currently displaying revision cdb4634bd259ec48217924ce9f3ad40b , Show latest

commit 41407069d192ca3d39d7fdd427f3292a48f7c8f4
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@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);
             }