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 | |
| 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')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v318rc1.php | 32 | ||||
| -rw-r--r-- | phpBB/phpbb/session.php | 2 |
2 files changed, 34 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v318rc1.php b/phpBB/phpbb/db/migration/data/v31x/v318rc1.php new file mode 100644 index 0000000000..8bae95c7d6 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v318rc1.php @@ -0,0 +1,32 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class v318rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\increase_size_of_dateformat', + '\phpbb\db\migration\data\v31x\v317pl1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.8-RC1')), + ); + } +} 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(); |