[commits] Horde branch master updated. 34f4e695f61f14c5c594f29c791976099f1ce511

[Jan Schneider]

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

from: 7b215bcf3c8fc4a86ad7c5c0a1bfecdd95d63345

984ec55 Deal with both formats of the _attachments hash (Bug #13268).
34f4e69 phpdoc

Summary: http://github.com/horde/horde/compare/7b215bcf3c8fc4a86ad7c5c0a1bfecdd95d63345...34f4e695f61f14c5c594f29c791976099f1ce511

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

commit 984ec55759dd59390686122d37722dfb4b9f4884
Author: Jan Schneider <jan at horde.org>
Date:   Tue Mar 24 12:18:53 2015 +0100

    Deal with both formats of the _attachments hash (Bug #13268).
    
    In the end I was able to reproducable that edge case.
    There is no use in trying to clean this mess up, because it would break the
    _attachments API that is used outside of Kolab_Storage. This needs refactoring
    for H6.

 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cache/Data.php |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/984ec55759dd59390686122d37722dfb4b9f4884

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

commit 34f4e695f61f14c5c594f29c791976099f1ce511
Author: Jan Schneider <jan at horde.org>
Date:   Tue Mar 24 12:21:45 2015 +0100

    phpdoc

 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php |   10 +++-----
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Object.php    |   10 +++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

http://github.com/horde/horde/commit/34f4e695f61f14c5c594f29c791976099f1ce511