[commits] Horde branch master updated. d97c6693f0f85ac073a9e0bc975ea916bae5f333

[Michael M Slusarz]

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

from: a947c40b0a60a058a97b035320e8c84bf2772c9f

24ccf14 Revert "On chora init error, use Chora::fatal()"
d97c669 More correct way to report chora errors

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

commit 24ccf14995d87b8e4724f914941cb04bca2792a6
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jan 25 14:38:06 2011 -0700

    Revert "On chora init error, use Chora::fatal()"
    
    This reverts commit f0224f9d168e52a6b84d4e725ec7db626f82d55c.
    
    Conflicts:
    
    	chora/lib/Application.php

 chora/lib/Application.php |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

http://git.horde.org/horde-git/-/commit/24ccf14995d87b8e4724f914941cb04bca2792a6

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

commit d97c6693f0f85ac073a9e0bc975ea916bae5f333
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jan 25 14:47:19 2011 -0700

    More correct way to report chora errors
    
    Can't call Chora::fatal() from init() since it may be called during
    Horde initialization.

 chora/annotate.php        |    6 +++++-
 chora/browsedir.php       |    6 +++++-
 chora/browsefile.php      |    6 +++++-
 chora/co.php              |    6 +++++-
 chora/commit.php          |    6 +++++-
 chora/cvsgraph.php        |    6 +++++-
 chora/diff.php            |    6 +++++-
 chora/history.php         |    6 +++++-
 chora/lib/Application.php |    3 ---
 chora/lib/Chora.php       |   13 +++++++------
 chora/patchsets.php       |    6 +++++-
 chora/stats.php           |    6 +++++-
 12 files changed, 57 insertions(+), 19 deletions(-)

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