[commits] Horde branch master updated. 43b343d9d2027cfb89e854743aa66abe937428af

[Michael J. Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: 591ebfda96911a63ceae0af32ddf55b0974583fc

4237b5e Only set the hash values is we have an entry in the map.
efe66d1 Fix detecting preferred email.
43b343d Simplify, and fix, _ensureEmail.

Summary: http://github.com/horde/horde/compare/591ebfda96911a63ceae0af32ddf55b0974583fc...43b343d9d2027cfb89e854743aa66abe937428af

-----------------------------------------------------------------------

commit 4237b5ee6ee7affe40c01228aef4c6e7bc4d1664
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Aug 18 21:39:16 2016 -0400

    Only set the hash values is we have an entry in the map.
    
    Part of Bug #14301: Part of the fix for dealing with various sync
    issues when incoming contact has TYPE attributes, but driver is
    configured with only a single email field. This one is need for being
    able to replace existing values.

 turba/lib/Driver.php | 7 +++++++
 1 file changed, 7 insertions(+)

http://github.com/horde/horde/commit/4237b5ee6ee7affe40c01228aef4c6e7bc4d1664

-----------------------------------------------------------------------

commit efe66d15b51d90618eabc3e8809599408e74490a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Aug 18 21:42:36 2016 -0400

    Fix detecting preferred email.
    
    Related to Bug: 14301 - not part of the original report, but this
    fixes picking a preferred email address when more email
    addresses are present in the incoming contact then the driver is
    configured to store.

 turba/lib/Driver.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

http://github.com/horde/horde/commit/efe66d15b51d90618eabc3e8809599408e74490a

-----------------------------------------------------------------------

commit 43b343d9d2027cfb89e854743aa66abe937428af
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Aug 18 22:00:40 2016 -0400

    Simplify, and fix, _ensureEmail.
    
    Fixes duplicating the same email address to multiple
    fields in certain cases. Part of Bug: 14301

 turba/lib/Object.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

http://github.com/horde/horde/commit/43b343d9d2027cfb89e854743aa66abe937428af