diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-02-13 18:08:28 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-02-13 18:08:28 +0100 |
| commit | c3370201ba374b755caae55b63f5194f0a8d3cff (patch) | |
| tree | 65bc28191313e01494a36ce295445955ee5e70d0 /phpBB/phpbb | |
| parent | 05fec8c642e00e2e6967c5043486fa232dd32db0 (diff) | |
| parent | 8663edce760da8451906fc557706b2980a424936 (diff) | |
| download | forums-c3370201ba374b755caae55b63f5194f0a8d3cff.tar forums-c3370201ba374b755caae55b63f5194f0a8d3cff.tar.gz forums-c3370201ba374b755caae55b63f5194f0a8d3cff.tar.bz2 forums-c3370201ba374b755caae55b63f5194f0a8d3cff.tar.xz forums-c3370201ba374b755caae55b63f5194f0a8d3cff.zip | |
Merge branch '3.2.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 3f7146c59b..12031bda03 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -1600,6 +1600,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(); |