aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-28 09:19:29 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-28 09:19:29 +0000
commit48db93349e1e7b8a23b8724d941e0396ca06175f (patch)
treee52718eac6aecaa770053f2d8ca9eb41d87eee80
parenta935f6e5f9b2e9b2002f2f5bd76c95413e2954bb (diff)
downloadforums-48db93349e1e7b8a23b8724d941e0396ca06175f.tar
forums-48db93349e1e7b8a23b8724d941e0396ca06175f.tar.gz
forums-48db93349e1e7b8a23b8724d941e0396ca06175f.tar.bz2
forums-48db93349e1e7b8a23b8724d941e0396ca06175f.tar.xz
forums-48db93349e1e7b8a23b8724d941e0396ca06175f.zip
*** empty log message ***
git-svn-id: file:///svn/phpbb/trunk@7966 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/session.php2
-rwxr-xr-xphpBB/ucp.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 275618f7dc..e18c71bcc5 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -590,7 +590,7 @@ class session
if (!defined('IN_ERROR_HANDLER') && (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows()))
{
// Limit new sessions in 1 minute period (if required)
- if ((!isset($this->data['session_time']) || !$this->data['session_time']) && $config['active_sessions'])
+ if (empty($this->data['session_time']) && $config['active_sessions'])
{
$sql = 'SELECT COUNT(session_id) AS sessions
FROM ' . SESSIONS_TABLE . '
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index fcb9c9ec71..0df248dd2d 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -82,7 +82,7 @@ switch ($mode)
break;
case 'logout':
- if ($user->data['user_id'] != ANONYMOUS && (!empty($_GET['sid']) && ($_GET['sid'] == $user->session_id)))
+ if ($user->data['user_id'] != ANONYMOUS && isset($_GET['sid']) && !is_array($_GET['sid']) && $_GET['sid'] === $user->session_id)
{
$user->session_kill();
$user->session_begin();