makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

do not conflict with updates

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8441 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-03-18 11:11:16 +00:00
parent d1d12ec986
commit 5a1d2a94a3
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/session.php
View file

@ -609,7 +609,7 @@ class session
// Limit new sessions in 1 minute period (if required) // Limit new sessions in 1 minute period (if required)
if (empty($this->data['session_time']) && $config['active_sessions']) if (empty($this->data['session_time']) && $config['active_sessions'])
{ {
$db->sql_return_on_error(false); // $db->sql_return_on_error(false);
$sql = 'SELECT COUNT(session_id) AS sessions $sql = 'SELECT COUNT(session_id) AS sessions
FROM ' . SESSIONS_TABLE . ' FROM ' . SESSIONS_TABLE . '
@ -627,7 +627,8 @@ class session
} }
// Since we re-create the session id here, the inserted row must be unique. Therefore, we display potential errors. // Since we re-create the session id here, the inserted row must be unique. Therefore, we display potential errors.
$db->sql_return_on_error(false); // Commented out because it will not allow forums to update correctly
// $db->sql_return_on_error(false);
$this->session_id = $this->data['session_id'] = md5(unique_id()); $this->session_id = $this->data['session_id'] = md5(unique_id());
@ -638,6 +639,8 @@ class session
$sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
$db->sql_query($sql); $db->sql_query($sql);
$db->sql_return_on_error(false);
// Regenerate autologin/persistent login key // Regenerate autologin/persistent login key
if ($session_autologin) if ($session_autologin)
{ {