mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 04:55:36 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2020-04-16 20:51:04 +02:00
commit c88b621d70
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 4 additions and 1 deletions

5
phpBB/phpbb/session.php

@ -27,6 +27,7 @@ class session
var $forwarded_for = '';
var $host = '';
var $session_id = '';
public $id = ANONYMOUS;
var $ip = '';
var $load = 0;
var $time_now = 0;
@ -364,6 +365,8 @@ class session
// Did the session exist in the DB?
if (isset($this->data['user_id']))
{
$this->id = (int) $this->data['user_id'];
// Validate IP length according to admin ... enforces an IP
// check on bots if admin requires this
// $quadcheck = ($config['ip_check_bot'] && $this->data['user_type'] & USER_BOT) ? 4 : $config['ip_check'];
@ -649,7 +652,7 @@ class session
}
// Force user id to be integer...
$this->data['user_id'] = (int) $this->data['user_id'];
$this->id = $this->data['user_id'] = (int) $this->data['user_id'];
// At this stage we should have a filled data array, defined cookie u and k data.
// data array should contain recent session info if we're a real user and a recent