The branch, master has been updated via d4f6b5c4ba7932c7ada66080d2a5351cc046447c (commit) via 8a153086a17cbc97423290b4fe7cfdf6f75e64a1 (commit) from bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d (commit)

- Log ----------------------------------------------------------------- commit d4f6b5c4ba7932c7ada66080d2a5351cc046447c Merge: bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d 8a153086a17cbc97423290b4fe7cfdf6f75e64a1 Author: Marc Delisle marc@infomarc.info Date: Wed Jul 7 06:13:38 2010 -0400

Merge branch 'QA_3_3'

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

Summary of changes: libraries/config.default.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php index 7b24d87..cd6ef6b 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -587,11 +587,12 @@ $cfg['Confirm'] = true; $cfg['LoginCookieRecall'] = true;

/** - * validity of cookie login (in seconds; 1800 seconds is 30 minutes) + * validity of cookie login (in seconds; 1440 matches php.ini's + * session.gc_maxlifetime) * * @global integer $cfg['LoginCookieValidity'] */ -$cfg['LoginCookieValidity'] = 1800; +$cfg['LoginCookieValidity'] = 1440;

/** * how long login cookie should be stored (in seconds)

hooks/post-receive