[commits] Horde branch master updated. 5c8129b964123ae783ba8ce5b8f27b75489f92c0

[Michael J. Rubinsky]

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

from: c485a23e85b468f4cd518ab4bf73eb21930935a2

5c8129b Don't override max_execution_time if running via the CLI.

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

commit 5c8129b964123ae783ba8ce5b8f27b75489f92c0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jun 12 13:36:28 2011 -0400

    Don't override max_execution_time if running via the CLI.
    
    Horde_Registry#__construct can be called after Horde_Registry#appInit,
    so the max_execution_time of zero that is set from Horde_CLI#init is
    overridden to $conf['max_execution_time'].

 framework/Core/lib/Horde/Registry.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/5c8129b964123ae783ba8ce5b8f27b75489f92c0