aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2016-02-13 16:45:04 +0100
committerJoas Schilling <nickvergessen@gmx.de>2016-02-13 16:45:04 +0100
commit9590ff3c18b032041f2dc8c726a6e290d6db2904 (patch)
treeca2cb7bd6975b18a82b1e93267ebf435d616a8e9 /phpBB/phpbb
parent4f07a0bafb5e8c80c18c5a4d7a8335e1a5c7939d (diff)
parent1bd4895d7ac933257ccad48d01245025e663c197 (diff)
downloadforums-9590ff3c18b032041f2dc8c726a6e290d6db2904.tar
forums-9590ff3c18b032041f2dc8c726a6e290d6db2904.tar.gz
forums-9590ff3c18b032041f2dc8c726a6e290d6db2904.tar.bz2
forums-9590ff3c18b032041f2dc8c726a6e290d6db2904.tar.xz
forums-9590ff3c18b032041f2dc8c726a6e290d6db2904.zip
Merge pull request #4176 from Elsensee/ticket/14409
[ticket/14409] Update session page info before displaying online list
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/session.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 6cff75c62c..83e87b7704 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1583,6 +1583,8 @@ class session
$db->sql_return_on_error(false);
+ $this->data = array_merge($this->data, $sql_ary);
+
if ($this->data['user_id'] != ANONYMOUS && !empty($config['new_member_post_limit']) && $this->data['user_new'] && $config['new_member_post_limit'] <= $this->data['user_posts'])
{
$this->leave_newly_registered();