Merge branch 'hotfix/1.7.7.1'

xpressengine · Sep 24, 2014 · a3e6104 · a3e6104
2 parents 7cb22a6 + a13e4eb
commit a3e6104
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/config.inc.php b/config/config.inc.php
@@ -29,7 +29,7 @@
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.7.7');
+define('__XE_VERSION__', '1.7.7.1');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
@@ -1891,7 +1891,7 @@ function regenerateSession()
 			$_SESSION['session_checkup'] = time();
 		}
 
-		if(time() - $_SESSION['session_checkup'] >= 1)
+		if(time() - $_SESSION['session_checkup'] > 30)
 		{
 			$_SESSION['destroyed'] = true;
 			session_regenerate_id();