Merge branch 'QA_3_3'

2010-07-06 16:58:50 -04:00
parent 573edc0329 9903c5f3d0
commit bd09ef50ff
2 changed files with 3 additions and 2 deletions
--- a/1
+++ b/1
@@ -95,6 +95,7 @@ $Id$
 - bug [replication] Do not offer information_schema in the list of databases
 - bug [js] Avoid loading twice a js file
 - bug #3024344 [setup] Setup forces numeric MemoryLimit
+- bug #3025975 [auth] Odd LoginCookieValidity default value

 3.3.4.0 (2010-06-28)
 - bug #2996161 [import] properly escape import value
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -587,11 +587,11 @@ $cfg['Confirm'] = true;
 $cfg['LoginCookieRecall'] = true;

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

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