[commits] Horde branch FRAMEWORK_5_2 updated. 2a92ecec7401663d650ab0ec86b213a0518173d8

[Michael J. Rubinsky]

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

from: 5cec8e36d07e27ef46be990d3831888bc2d73bac

9f14291 Only set the hash values is we have an entry in the map.
a14e91a Fix detecting preferred email.
2a92ece Simplify, and fix, _ensureEmail.

Summary: http://github.com/horde/horde/compare/5cec8e36d07e27ef46be990d3831888bc2d73bac...2a92ecec7401663d650ab0ec86b213a0518173d8

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

commit 9f1429129bb4134ac0e962c56320b044d0bebd73
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/9f1429129bb4134ac0e962c56320b044d0bebd73

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

commit a14e91a34bbb48474231df1aa7e527d981205223
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/a14e91a34bbb48474231df1aa7e527d981205223

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

commit 2a92ecec7401663d650ab0ec86b213a0518173d8
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/2a92ecec7401663d650ab0ec86b213a0518173d8