From a7bfe9afed0f096c4c13a26e6dfec4c492a5d48f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Jun 2020 14:26:28 +0200 Subject: [PATCH] [ticket/16397] Add method for retrieving user ID This replaces the previously added public property. PHPBB3-16397 --- phpBB/phpbb/session.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 58d56ff3f3..b7bb364ec9 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -25,7 +25,6 @@ class session var $forwarded_for = ''; var $host = ''; var $session_id = ''; - public $id = ANONYMOUS; var $ip = ''; var $load = 0; var $time_now = 0; @@ -363,8 +362,6 @@ 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']; @@ -650,7 +647,7 @@ class session } // Force user id to be integer... - $this->id = $this->data['user_id'] = (int) $this->data['user_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 @@ -1667,4 +1664,14 @@ class session } } } + + /** + * Get user ID + * + * @return int User ID + */ + public function id() : int + { + return isset($this->data['user_id']) ? (int) $this->data['user_id'] : ANONYMOUS; + } }