Merge branch 'QA_3_3'

2010-07-07 06:13:38 -04:00
parent bd09ef50ff 8a153086a1
commit d4f6b5c4ba
1 changed files with 3 additions and 2 deletions
--- 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)