[commits] Horde branch master updated. c0e3e263d650cbdec3dbadaba8206dc446e229df

[Michael M Slusarz]

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

from: 0c1b0b139a5b0a8273df56adf26b724648bdb318

9d5b0e6 Resolve some TODOs
c0e3e26 Revert "Bug #9575: Temporary fix to load existing portals again."

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

commit 9d5b0e625540548bb3d71d4c68629a0a3a69578a
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Mar 3 15:38:57 2011 -0700

    Resolve some TODOs

 imp/lib/Imap.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/9d5b0e625540548bb3d71d4c68629a0a3a69578a

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

commit c0e3e263d650cbdec3dbadaba8206dc446e229df
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Mar 3 16:00:08 2011 -0700

    Revert "Bug #9575: Temporary fix to load existing portals again."
    
    This reverts commit 16d05e3a8c745eaa8551d7783e5619c29a086c63.
    
    This completely breaks loading newly added blocks.  Old blocks
    will either need to be converted or deleted/re-added.

 framework/Core/lib/Horde/Core/Block/Collection.php |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/c0e3e263d650cbdec3dbadaba8206dc446e229df