fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/1.7.7.1' into develop

Browse source
This commit is contained in:
bnu 2014-09-24 11:16:35 +09:00
commit 9356022c31
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.inc.php
View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/** /**
* Display XE's full version. * 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_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false)); define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false)); define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

2
modules/member/member.controller.php
View file

@ -1892,7 +1892,7 @@ class memberController extends member
$_SESSION['session_checkup'] = time(); $_SESSION['session_checkup'] = time();
} }
if(time() - $_SESSION['session_checkup'] >= 1) if(time() - $_SESSION['session_checkup'] > 30)
{ {
$_SESSION['destroyed'] = true; $_SESSION['destroyed'] = true;
session_regenerate_id(); session_regenerate_id();