aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2016-02-13 18:08:01 +0100
committerJoas Schilling <nickvergessen@gmx.de>2016-02-13 18:08:01 +0100
commit8663edce760da8451906fc557706b2980a424936 (patch)
tree65bc28191313e01494a36ce295445955ee5e70d0 /phpBB/phpbb
parent971fe13a2893bf9ff550d2ae60de9613d56dda62 (diff)
parent17e21d5140ccb99363a32bd64c32af6012c1ce97 (diff)
downloadforums-8663edce760da8451906fc557706b2980a424936.tar
forums-8663edce760da8451906fc557706b2980a424936.tar.gz
forums-8663edce760da8451906fc557706b2980a424936.tar.bz2
forums-8663edce760da8451906fc557706b2980a424936.tar.xz
forums-8663edce760da8451906fc557706b2980a424936.zip
Merge branch '3.1.x' into 3.2.x
Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/constants.php phpBB/includes/functions_user.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/v318rc1.php32
-rw-r--r--phpBB/phpbb/session.php2
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();