Merge branch 'master' of ssh://bitbucket.org/rusty_angel/rock-site

This commit is contained in:
Aleksei Miheev
2014-01-12 15:13:27 +04:00

View File

@@ -1437,10 +1437,9 @@ function writeLog($force = false)
// Guests use 0, members use their session ID.
$session_id = $user_info['is_guest'] ? 'ip' . $user_info['ip'] : session_id();
$sess_expire_time = time() - ($modSettings['lastActive'] * 60);
db_query("
DELETE FROM {$db_prefix}log_online
WHERE logTime < '{$sess_expire_time}'
WHERE logTime < NOW() - INTERVAL " . ($modSettings['lastActive'] * 60) . " SECOND
OR session = '$session_id'" . (empty($ID_MEMBER) ? '' : " OR ID_MEMBER = $ID_MEMBER"), __FILE__, __LINE__);
db_query("
INSERT IGNORE INTO {$db_prefix}log_online