diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-18 11:11:16 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-18 11:11:16 +0000 |
| commit | 5a1d2a94a3af00cee33e0add91a1c5a75c09c250 (patch) | |
| tree | 354b92e6830cdc5c2fbe903053778b42da9a4a3f /phpBB/includes | |
| parent | d1d12ec9861deaf4b850cd1168182471c2712512 (diff) | |
| download | forums-5a1d2a94a3af00cee33e0add91a1c5a75c09c250.tar forums-5a1d2a94a3af00cee33e0add91a1c5a75c09c250.tar.gz forums-5a1d2a94a3af00cee33e0add91a1c5a75c09c250.tar.bz2 forums-5a1d2a94a3af00cee33e0add91a1c5a75c09c250.tar.xz forums-5a1d2a94a3af00cee33e0add91a1c5a75c09c250.zip | |
do not conflict with updates
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8441 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/session.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 9aee53531c..382f76aca3 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -609,7 +609,7 @@ class session // Limit new sessions in 1 minute period (if required) 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 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. - $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()); @@ -638,6 +639,8 @@ class session $sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $db->sql_query($sql); + $db->sql_return_on_error(false); + // Regenerate autologin/persistent login key if ($session_autologin) { |