[commits] Horde branch FRAMEWORK_5_2 updated. 3be9eed71f1a049ef2f487de79251ca7f880812a

[Michael M Slusarz]

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

from: 3efc5e4038a10501a627ff55f505f6ef58786b5a

3be9eed Fix GPG Publkey import when also provided by Hook

Summary: http://github.com/horde/horde/compare/3efc5e4038a10501a627ff55f505f6ef58786b5a...3be9eed71f1a049ef2f487de79251ca7f880812a

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

commit 3be9eed71f1a049ef2f487de79251ca7f880812a
Author: o <o at immerda.ch>
Date:   Mon Dec 15 16:18:52 2014 +0100

    Fix GPG Publkey import when also provided by Hook
    
    If a GPG Publickey happens to be provided by a gpg_key Hook in IMP it
    was not possible for a user to import said key into his keyring.
    
    This Patch skips gpg_key hook when getPublicKey is called to determine if
    a user already has the PublicKey in his keyring.

 imp/lib/Crypt/Pgp.php |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

http://github.com/horde/horde/commit/3be9eed71f1a049ef2f487de79251ca7f880812a