[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-16-g9903c5f

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  9903c5f3d0b4fe9bdc44f7f9ff37e110114e678a (commit)
      from  43e41e0654c6d85e9311796631fddbf15f568cd3 (commit)


- Log -----------------------------------------------------------------
commit 9903c5f3d0b4fe9bdc44f7f9ff37e110114e678a
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Jul 6 16:58:13 2010 -0400

    bug #3025975 [auth] Odd LoginCookieValidity default value

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

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

diff --git a/ChangeLog b/ChangeLog
index 7c019b0..9da63ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - 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
diff --git a/libraries/config.default.php b/libraries/config.default.php
index de03aa2..eea22aa 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -580,11 +580,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)


hooks/post-receive
-- 
phpMyAdmin