[commits] Horde branch master updated. e987319924a9143e838721befcb6352658bbdccb

[Jan Schneider]

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

from: 0aeeac5967074a1a36bc51cf02917364a98814f1

cbdba3d Revert "[jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder."
e987319 Catch objects types not matching the data backend here.

Summary: http://github.com/horde/horde/compare/0aeeac5967074a1a36bc51cf02917364a98814f1...e987319924a9143e838721befcb6352658bbdccb

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

commit cbdba3d65570425d02a0d30b5890b92429f40e20
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 18 20:26:42 2013 +0100

    Revert "[jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder."
    
    This would break reporting of errors from parsing the Kolab objects.
    
    This reverts commit cd52bc59ef7d5d04263496a1dc5c098e915ba511.

 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php |    4 +---
 framework/Kolab_Storage/package.xml                           |    4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

http://github.com/horde/horde/commit/cbdba3d65570425d02a0d30b5890b92429f40e20
http://git.horde.org/horde-git/-/commit/cbdba3d65570425d02a0d30b5890b92429f40e20

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

commit e987319924a9143e838721befcb6352658bbdccb
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 18 20:28:39 2013 +0100

    Catch objects types not matching the data backend here.

 turba/lib/Driver/Kolab.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/e987319924a9143e838721befcb6352658bbdccb
http://git.horde.org/horde-git/-/commit/e987319924a9143e838721befcb6352658bbdccb