From a1a84c993094c6a78c252647a510e5082aa83a09 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 13 Feb 2016 14:55:24 +0100
Subject: [prep-release-3.1.8] Add migration for 3.1.8-RC1

---
 phpBB/phpbb/db/migration/data/v31x/v318rc1.php | 32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 phpBB/phpbb/db/migration/data/v31x/v318rc1.php

(limited to 'phpBB/phpbb')

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')),
+		);
+	}
+}
-- 
cgit v1.2.1


From 1bd4895d7ac933257ccad48d01245025e663c197 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sat, 13 Feb 2016 14:57:04 +0100
Subject: [ticket/14409] Update session page info before displaying online list

PHPBB3-14409
---
 phpBB/phpbb/session.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/phpbb')

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();
-- 
cgit v1.2.1