diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-02-13 18:00:20 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-02-13 18:00:20 +0100 |
| commit | c2ea2a3e18d5a0d47b50b41ba9d817428061d97f (patch) | |
| tree | 248b22494bdc1ad21b13613a447494bb43d5c9cd /phpBB/phpbb/session.php | |
| parent | ad5d4f6bc3a061452d415ce0ee5929e33566f29b (diff) | |
| parent | cafd165bd03fc1abcfb5ac8058ac658d139221b7 (diff) | |
| download | forums-c2ea2a3e18d5a0d47b50b41ba9d817428061d97f.tar forums-c2ea2a3e18d5a0d47b50b41ba9d817428061d97f.tar.gz forums-c2ea2a3e18d5a0d47b50b41ba9d817428061d97f.tar.bz2 forums-c2ea2a3e18d5a0d47b50b41ba9d817428061d97f.tar.xz forums-c2ea2a3e18d5a0d47b50b41ba9d817428061d97f.zip | |
Merge branch 'prep-release-3.1.8' into 3.1.x
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 2 |
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(); |