Merge branch 'QA_3_3'

This commit is contained in:
Marc Delisle
2010-07-07 06:13:38 -04:00

View File

@@ -587,11 +587,12 @@ $cfg['Confirm'] = true;
$cfg['LoginCookieRecall'] = 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'] * @global integer $cfg['LoginCookieValidity']
*/ */
$cfg['LoginCookieValidity'] = 1800; $cfg['LoginCookieValidity'] = 1440;
/** /**
* how long login cookie should be stored (in seconds) * how long login cookie should be stored (in seconds)